diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json index cdfa06094cfcd..6b5f6c9f69ad1 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -59,16 +59,14 @@ "id": 21 }, - "bing": { - "name": "Bing", - "keyword": "bing.com", - "favicon_url": "https://www.bing.com/sa/simg/bing_p_rr_teal_min.ico", - "search_url": "https://www.bing.com/search?q={searchTerms}&PC=U316&FORM=CHROMN", - "suggest_url": "https://www.bing.com/osjson.aspx?query={searchTerms}&language={language}&PC=U316", - "image_url": "https://www.bing.com/images/detail/search?iss=sbiupload&FORM=CHROMI#enterInsights", - "new_tab_url": "https://www.bing.com/chrome/newtab", - "image_url_post_params": "imageBin={google:imageThumbnailBase64}", - "type": "SEARCH_ENGINE_BING", + "swisscows": { + "name": "Swisscows", + "keyword": "swisscows.com", + "favicon_url": "https://leos-gsi.de/fav.ico", + "search_url": "https://swisscows.com/web?query={searchTerms}&addon=opensearch", + "suggest_url": "https://swisscows.com/web?query={searchTerms}&type=list", + "new_tab_url": "https://swisscows/newtab/", + "type": "SEARCH_ENGINE_SWISSCOWS", "id": 3 }, @@ -112,34 +110,17 @@ "type": "SEARCH_ENGINE_ECOSIA", "id": 101 }, + "you": { + "name": "You", + "keyword": "you.com", + "favicon_url": "https://leos-gsi.de/fav.ico", + "search_url": "https://you.com/search?q={searchTerms}&addon=opensearch", + "suggest_url": "https://you.com/autocomplete?q={searchTerms}&type=list", + "new_tab_url": "https://you.com/newtab/", + "type": "SEARCH_ENGINE_YOU", + "id": 1 + }, - "google": { - "name": "Google", - "keyword": "google.com", - "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico", - "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}", - "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:clientCacheTimeToLive}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}", - "image_url": "{google:baseSearchByImageURL}upload", - "image_translate_url": "{google:baseSearchByImageURL}upload?filtertype=tr&{imageTranslateSourceLocale}{imageTranslateTargetLocale}", - "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}", - "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},processed_image_dimensions={google:processedImageDimensions}", - "side_search_param": "sidesearch", - "image_translate_source_language_param_key": "sourcelang", - "image_translate_target_language_param_key": "targetlang", - "side_image_search_param": "sideimagesearch", - "search_intent_params": ["si", "gs_ssp"], - "alternate_urls": [ - "{google:baseURL}#q={searchTerms}", - "{google:baseURL}search#q={searchTerms}", - "{google:baseURL}webhp#q={searchTerms}", - "{google:baseURL}s#q={searchTerms}", - "{google:baseURL}s?q={searchTerms}" - ], - "type": "SEARCH_ENGINE_GOOGLE", - "preconnect_to_search_url" : "ALLOWED", - "prefetch_likely_navigations" : "ALLOWED", - "id": 1 - }, "mail_ru": { "name": "@MAIL.RU", diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h index ab078967ce677..5f822c13e45ff 100644 --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h @@ -21,7 +21,7 @@ enum SearchEngineType { SEARCH_ENGINE_AVG = 4, SEARCH_ENGINE_BAIDU = 5, SEARCH_ENGINE_BABYLON = 6, - SEARCH_ENGINE_BING = 7, + SEARCH_ENGINE_SWISSCOWS = 7, SEARCH_ENGINE_CONDUIT = 8, SEARCH_ENGINE_DAUM = 9, SEARCH_ENGINE_DELFI = 10, @@ -78,6 +78,7 @@ enum SearchEngineType { SEARCH_ENGINE_STARTER_PACK_BOOKMARKS = 61, SEARCH_ENGINE_STARTER_PACK_HISTORY = 62, SEARCH_ENGINE_STARTER_PACK_TABS = 63, + SEARCH_ENGINE_YOU = 64, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. }; diff --git a/components/search_engines/search_engine_utils.cc b/components/search_engines/search_engine_utils.cc index d6522dab752e4..f124d1f2b477b 100644 --- a/components/search_engines/search_engine_utils.cc +++ b/components/search_engines/search_engine_utils.cc @@ -33,9 +33,9 @@ SearchEngineType GetEngineType(const GURL& url) { // First special-case Google, because the prepopulate URL for it will not // convert to a GURL and thus won't have an origin. Instead see if the // incoming URL's host is "[*.]google.". - if (google_util::IsGoogleDomainUrl(url, google_util::DISALLOW_SUBDOMAIN, - google_util::ALLOW_NON_STANDARD_PORTS)) - return TemplateURLPrepopulateData::google.type; +// if (google_util::IsGoogleDomainUrl(url, google_util::DISALLOW_SUBDOMAIN, +// google_util::ALLOW_NON_STANDARD_PORTS)) +// return TemplateURLPrepopulateData::google.type; // Now check the rest of the prepopulate data. for (size_t i = 0; i < TemplateURLPrepopulateData::kAllEnginesLength; ++i) { diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc index 691c22fe6d866..998bbbebc45e0 100644 --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc @@ -29,8 +29,8 @@ namespace { // Default (for countries with no better engine set) const PrepopulatedEngine* const engines_default[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, }; @@ -39,8 +39,8 @@ const PrepopulatedEngine* const engines_default[] = { // clang-format off // United Arab Emirates const PrepopulatedEngine* const engines_AE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_ru, @@ -48,8 +48,8 @@ const PrepopulatedEngine* const engines_AE[] = { // Albania const PrepopulatedEngine* const engines_AL[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_tr, @@ -57,8 +57,8 @@ const PrepopulatedEngine* const engines_AL[] = { // Argentina const PrepopulatedEngine* const engines_AR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_ar, &duckduckgo, &ecosia, @@ -66,8 +66,8 @@ const PrepopulatedEngine* const engines_AR[] = { // Austria const PrepopulatedEngine* const engines_AT[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_at, &duckduckgo, &ecosia, @@ -75,8 +75,8 @@ const PrepopulatedEngine* const engines_AT[] = { // Australia const PrepopulatedEngine* const engines_AU[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_au, &duckduckgo, &ecosia, @@ -84,8 +84,8 @@ const PrepopulatedEngine* const engines_AU[] = { // Bosnia and Herzegovina const PrepopulatedEngine* const engines_BA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -93,8 +93,8 @@ const PrepopulatedEngine* const engines_BA[] = { // Belgium const PrepopulatedEngine* const engines_BE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &ecosia, &duckduckgo, @@ -102,8 +102,8 @@ const PrepopulatedEngine* const engines_BE[] = { // Bulgaria const PrepopulatedEngine* const engines_BG[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_ru, @@ -111,8 +111,8 @@ const PrepopulatedEngine* const engines_BG[] = { // Bahrain const PrepopulatedEngine* const engines_BH[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -120,8 +120,8 @@ const PrepopulatedEngine* const engines_BH[] = { // Burundi const PrepopulatedEngine* const engines_BI[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_ru, @@ -129,8 +129,8 @@ const PrepopulatedEngine* const engines_BI[] = { // Brunei const PrepopulatedEngine* const engines_BN[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -138,8 +138,8 @@ const PrepopulatedEngine* const engines_BN[] = { // Bolivia const PrepopulatedEngine* const engines_BO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -147,8 +147,8 @@ const PrepopulatedEngine* const engines_BO[] = { // Brazil const PrepopulatedEngine* const engines_BR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_br, &duckduckgo, &yandex_com, @@ -156,17 +156,17 @@ const PrepopulatedEngine* const engines_BR[] = { // Belarus const PrepopulatedEngine* const engines_BY[] = { - &google, + &you, &yandex_by, &mail_ru, - &bing, + &swisscows, &duckduckgo, }; // Belize const PrepopulatedEngine* const engines_BZ[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &naver, @@ -174,8 +174,8 @@ const PrepopulatedEngine* const engines_BZ[] = { // Canada const PrepopulatedEngine* const engines_CA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_ca, &duckduckgo, &ecosia, @@ -183,8 +183,8 @@ const PrepopulatedEngine* const engines_CA[] = { // Switzerland const PrepopulatedEngine* const engines_CH[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo_ch, &ecosia, @@ -192,8 +192,8 @@ const PrepopulatedEngine* const engines_CH[] = { // Chile const PrepopulatedEngine* const engines_CL[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_cl, &duckduckgo, &ecosia, @@ -202,16 +202,16 @@ const PrepopulatedEngine* const engines_CL[] = { // China const PrepopulatedEngine* const engines_CN[] = { &baidu, - &bing, + &swisscows, &sogou, &so_360, - &google, + &you, }; // Colombia const PrepopulatedEngine* const engines_CO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_co, &duckduckgo, &ecosia, @@ -219,8 +219,8 @@ const PrepopulatedEngine* const engines_CO[] = { // Costa Rica const PrepopulatedEngine* const engines_CR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -228,17 +228,17 @@ const PrepopulatedEngine* const engines_CR[] = { // Czech Republic const PrepopulatedEngine* const engines_CZ[] = { - &google, + &you, &seznam_cz, - &bing, + &swisscows, &yahoo, &duckduckgo, }; // Germany const PrepopulatedEngine* const engines_DE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_de, &duckduckgo, &ecosia, @@ -246,8 +246,8 @@ const PrepopulatedEngine* const engines_DE[] = { // Denmark const PrepopulatedEngine* const engines_DK[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_dk, &duckduckgo, &ecosia, @@ -255,8 +255,8 @@ const PrepopulatedEngine* const engines_DK[] = { // Dominican Republic const PrepopulatedEngine* const engines_DO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -264,8 +264,8 @@ const PrepopulatedEngine* const engines_DO[] = { // Algeria const PrepopulatedEngine* const engines_DZ[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_fr, &yandex_com, &duckduckgo, @@ -273,8 +273,8 @@ const PrepopulatedEngine* const engines_DZ[] = { // Ecuador const PrepopulatedEngine* const engines_EC[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &ecosia, &duckduckgo, @@ -282,8 +282,8 @@ const PrepopulatedEngine* const engines_EC[] = { // Estonia const PrepopulatedEngine* const engines_EE[] = { - &google, - &bing, + &you, + &swisscows, &yandex_ru, &duckduckgo, &mail_ru, @@ -291,8 +291,8 @@ const PrepopulatedEngine* const engines_EE[] = { // Egypt const PrepopulatedEngine* const engines_EG[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &yandex_com, &duckduckgo, @@ -300,8 +300,8 @@ const PrepopulatedEngine* const engines_EG[] = { // Spain const PrepopulatedEngine* const engines_ES[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &duckduckgo, &ecosia, @@ -309,8 +309,8 @@ const PrepopulatedEngine* const engines_ES[] = { // Finland const PrepopulatedEngine* const engines_FI[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_fi, &duckduckgo, &yandex_ru, @@ -318,8 +318,8 @@ const PrepopulatedEngine* const engines_FI[] = { // Faroe Islands const PrepopulatedEngine* const engines_FO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_uk, &duckduckgo, &ecosia, @@ -327,8 +327,8 @@ const PrepopulatedEngine* const engines_FO[] = { // France const PrepopulatedEngine* const engines_FR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_fr, &qwant, &ecosia, @@ -336,8 +336,8 @@ const PrepopulatedEngine* const engines_FR[] = { // United Kingdom const PrepopulatedEngine* const engines_GB[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_uk, &duckduckgo, &ecosia, @@ -345,8 +345,8 @@ const PrepopulatedEngine* const engines_GB[] = { // Greece const PrepopulatedEngine* const engines_GR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_ru, @@ -354,8 +354,8 @@ const PrepopulatedEngine* const engines_GR[] = { // Guatemala const PrepopulatedEngine* const engines_GT[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -363,8 +363,8 @@ const PrepopulatedEngine* const engines_GT[] = { // Hong Kong const PrepopulatedEngine* const engines_HK[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_hk, &baidu, &so_360, @@ -372,8 +372,8 @@ const PrepopulatedEngine* const engines_HK[] = { // Honduras const PrepopulatedEngine* const engines_HN[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -381,8 +381,8 @@ const PrepopulatedEngine* const engines_HN[] = { // Croatia const PrepopulatedEngine* const engines_HR[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo, &ecosia, @@ -390,8 +390,8 @@ const PrepopulatedEngine* const engines_HR[] = { // Hungary const PrepopulatedEngine* const engines_HU[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -399,8 +399,8 @@ const PrepopulatedEngine* const engines_HU[] = { // Indonesia const PrepopulatedEngine* const engines_ID[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_id, &duckduckgo, &yandex_com, @@ -408,8 +408,8 @@ const PrepopulatedEngine* const engines_ID[] = { // Ireland const PrepopulatedEngine* const engines_IE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_uk, &duckduckgo, &ecosia, @@ -417,8 +417,8 @@ const PrepopulatedEngine* const engines_IE[] = { // Israel const PrepopulatedEngine* const engines_IL[] = { - &google, - &bing, + &you, + &swisscows, &yandex_ru, &yahoo, &duckduckgo, @@ -426,8 +426,8 @@ const PrepopulatedEngine* const engines_IL[] = { // India const PrepopulatedEngine* const engines_IN[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_in, &duckduckgo, &info_com, @@ -435,8 +435,8 @@ const PrepopulatedEngine* const engines_IN[] = { // Iraq const PrepopulatedEngine* const engines_IQ[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &yandex_tr, &petal_search, @@ -444,8 +444,8 @@ const PrepopulatedEngine* const engines_IQ[] = { // Iran const PrepopulatedEngine* const engines_IR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ask, @@ -453,8 +453,8 @@ const PrepopulatedEngine* const engines_IR[] = { // Iceland const PrepopulatedEngine* const engines_IS[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo, &ecosia, @@ -462,8 +462,8 @@ const PrepopulatedEngine* const engines_IS[] = { // Italy const PrepopulatedEngine* const engines_IT[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -471,8 +471,8 @@ const PrepopulatedEngine* const engines_IT[] = { // Jamaica const PrepopulatedEngine* const engines_JM[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -480,8 +480,8 @@ const PrepopulatedEngine* const engines_JM[] = { // Jordan const PrepopulatedEngine* const engines_JO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &petal_search, &duckduckgo, @@ -489,8 +489,8 @@ const PrepopulatedEngine* const engines_JO[] = { // Japan const PrepopulatedEngine* const engines_JP[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_jp, &duckduckgo, &baidu, @@ -498,8 +498,8 @@ const PrepopulatedEngine* const engines_JP[] = { // Kenya const PrepopulatedEngine* const engines_KE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -507,17 +507,17 @@ const PrepopulatedEngine* const engines_KE[] = { // South Korea const PrepopulatedEngine* const engines_KR[] = { - &google, + &you, &naver, - &bing, + &swisscows, &daum, &yahoo, }; // Kuwait const PrepopulatedEngine* const engines_KW[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_tr, @@ -525,17 +525,17 @@ const PrepopulatedEngine* const engines_KW[] = { // Kazakhstan const PrepopulatedEngine* const engines_KZ[] = { - &google, + &you, &yandex_kz, &mail_ru, - &bing, + &swisscows, &duckduckgo, }; // Lebanon const PrepopulatedEngine* const engines_LB[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -543,8 +543,8 @@ const PrepopulatedEngine* const engines_LB[] = { // Liechtenstein const PrepopulatedEngine* const engines_LI[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo, &ecosia, @@ -552,8 +552,8 @@ const PrepopulatedEngine* const engines_LI[] = { // Lithuania const PrepopulatedEngine* const engines_LT[] = { - &google, - &bing, + &you, + &swisscows, &yandex_ru, &duckduckgo, &yahoo, @@ -561,8 +561,8 @@ const PrepopulatedEngine* const engines_LT[] = { // Luxembourg const PrepopulatedEngine* const engines_LU[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo, &ecosia, @@ -570,8 +570,8 @@ const PrepopulatedEngine* const engines_LU[] = { // Latvia const PrepopulatedEngine* const engines_LV[] = { - &google, - &bing, + &you, + &swisscows, &yandex_ru, &yahoo, &duckduckgo, @@ -579,8 +579,8 @@ const PrepopulatedEngine* const engines_LV[] = { // Libya const PrepopulatedEngine* const engines_LY[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &yandex_tr, &duckduckgo, @@ -588,8 +588,8 @@ const PrepopulatedEngine* const engines_LY[] = { // Morocco const PrepopulatedEngine* const engines_MA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_fr, &yandex_com, &duckduckgo, @@ -597,8 +597,8 @@ const PrepopulatedEngine* const engines_MA[] = { // Monaco const PrepopulatedEngine* const engines_MC[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_fr, &duckduckgo, &qwant, @@ -606,17 +606,17 @@ const PrepopulatedEngine* const engines_MC[] = { // Moldova const PrepopulatedEngine* const engines_MD[] = { - &google, + &you, &yandex_ru, - &bing, + &swisscows, &mail_ru, &duckduckgo, }; // Montenegro const PrepopulatedEngine* const engines_ME[] = { - &google, - &bing, + &you, + &swisscows, &yandex_ru, &yahoo, &duckduckgo, @@ -624,8 +624,8 @@ const PrepopulatedEngine* const engines_ME[] = { // Macedonia const PrepopulatedEngine* const engines_MK[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -633,8 +633,8 @@ const PrepopulatedEngine* const engines_MK[] = { // Mexico const PrepopulatedEngine* const engines_MX[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_mx, &duckduckgo, &ecosia, @@ -642,8 +642,8 @@ const PrepopulatedEngine* const engines_MX[] = { // Malaysia const PrepopulatedEngine* const engines_MY[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_my, &duckduckgo, &ecosia, @@ -651,8 +651,8 @@ const PrepopulatedEngine* const engines_MY[] = { // Nicaragua const PrepopulatedEngine* const engines_NI[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -660,8 +660,8 @@ const PrepopulatedEngine* const engines_NI[] = { // Netherlands const PrepopulatedEngine* const engines_NL[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_nl, &duckduckgo, &yandex_ru, @@ -669,8 +669,8 @@ const PrepopulatedEngine* const engines_NL[] = { // Norway const PrepopulatedEngine* const engines_NO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -678,8 +678,8 @@ const PrepopulatedEngine* const engines_NO[] = { // New Zealand const PrepopulatedEngine* const engines_NZ[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_nz, &duckduckgo, &ecosia, @@ -687,8 +687,8 @@ const PrepopulatedEngine* const engines_NZ[] = { // Oman const PrepopulatedEngine* const engines_OM[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &petal_search, &duckduckgo, @@ -696,8 +696,8 @@ const PrepopulatedEngine* const engines_OM[] = { // Panama const PrepopulatedEngine* const engines_PA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &duckduckgo, &ecosia, @@ -705,8 +705,8 @@ const PrepopulatedEngine* const engines_PA[] = { // Peru const PrepopulatedEngine* const engines_PE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_pe, &ecosia, &duckduckgo, @@ -714,8 +714,8 @@ const PrepopulatedEngine* const engines_PE[] = { // Philippines const PrepopulatedEngine* const engines_PH[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_ph, &ecosia, &duckduckgo, @@ -723,8 +723,8 @@ const PrepopulatedEngine* const engines_PH[] = { // Pakistan const PrepopulatedEngine* const engines_PK[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -732,8 +732,8 @@ const PrepopulatedEngine* const engines_PK[] = { // Poland const PrepopulatedEngine* const engines_PL[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_ru, @@ -741,8 +741,8 @@ const PrepopulatedEngine* const engines_PL[] = { // Puerto Rico const PrepopulatedEngine* const engines_PR[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -750,8 +750,8 @@ const PrepopulatedEngine* const engines_PR[] = { // Portugal const PrepopulatedEngine* const engines_PT[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -759,8 +759,8 @@ const PrepopulatedEngine* const engines_PT[] = { // Paraguay const PrepopulatedEngine* const engines_PY[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &duckduckgo, &ecosia, @@ -768,8 +768,8 @@ const PrepopulatedEngine* const engines_PY[] = { // Qatar const PrepopulatedEngine* const engines_QA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_tr, @@ -777,8 +777,8 @@ const PrepopulatedEngine* const engines_QA[] = { // Romania const PrepopulatedEngine* const engines_RO[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_tr, @@ -786,8 +786,8 @@ const PrepopulatedEngine* const engines_RO[] = { // Serbia const PrepopulatedEngine* const engines_RS[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_ru, @@ -796,16 +796,16 @@ const PrepopulatedEngine* const engines_RS[] = { // Russia const PrepopulatedEngine* const engines_RU[] = { &yandex_ru, - &google, + &you, &duckduckgo, - &bing, + &swisscows, &mail_ru, }; // Rwanda const PrepopulatedEngine* const engines_RW[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -813,8 +813,8 @@ const PrepopulatedEngine* const engines_RW[] = { // Saudi Arabia const PrepopulatedEngine* const engines_SA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &yandex_com, &duckduckgo, @@ -822,8 +822,8 @@ const PrepopulatedEngine* const engines_SA[] = { // Sweden const PrepopulatedEngine* const engines_SE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_se, &duckduckgo, &yandex_ru, @@ -831,8 +831,8 @@ const PrepopulatedEngine* const engines_SE[] = { // Singapore const PrepopulatedEngine* const engines_SG[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_sg, &baidu, &duckduckgo, @@ -840,8 +840,8 @@ const PrepopulatedEngine* const engines_SG[] = { // Slovenia const PrepopulatedEngine* const engines_SI[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo, &yandex_com, @@ -849,8 +849,8 @@ const PrepopulatedEngine* const engines_SI[] = { // Slovakia const PrepopulatedEngine* const engines_SK[] = { - &google, - &bing, + &you, + &swisscows, &duckduckgo, &yahoo, &yandex_ru, @@ -858,8 +858,8 @@ const PrepopulatedEngine* const engines_SK[] = { // El Salvador const PrepopulatedEngine* const engines_SV[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &duckduckgo, &ecosia, @@ -867,8 +867,8 @@ const PrepopulatedEngine* const engines_SV[] = { // Syria const PrepopulatedEngine* const engines_SY[] = { - &google, - &bing, + &you, + &swisscows, &yandex_ru, &yahoo, &duckduckgo, @@ -876,8 +876,8 @@ const PrepopulatedEngine* const engines_SY[] = { // Thailand const PrepopulatedEngine* const engines_TH[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_th, &naver, &duckduckgo, @@ -885,8 +885,8 @@ const PrepopulatedEngine* const engines_TH[] = { // Tunisia const PrepopulatedEngine* const engines_TN[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_fr, &duckduckgo, &yandex_com, @@ -894,17 +894,17 @@ const PrepopulatedEngine* const engines_TN[] = { // Turkey const PrepopulatedEngine* const engines_TR[] = { - &google, + &you, &yandex_tr, &yahoo_tr, - &bing, + &swisscows, &duckduckgo, }; // Trinidad and Tobago const PrepopulatedEngine* const engines_TT[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -912,17 +912,17 @@ const PrepopulatedEngine* const engines_TT[] = { // Taiwan const PrepopulatedEngine* const engines_TW[] = { - &google, + &you, &yahoo_tw, - &bing, + &swisscows, &baidu, &duckduckgo, }; // Tanzania const PrepopulatedEngine* const engines_TZ[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -930,17 +930,17 @@ const PrepopulatedEngine* const engines_TZ[] = { // Ukraine const PrepopulatedEngine* const engines_UA[] = { - &google, + &you, &yandex_ru, - &bing, + &swisscows, &duckduckgo, &mail_ru, }; // United States const PrepopulatedEngine* const engines_US[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -948,8 +948,8 @@ const PrepopulatedEngine* const engines_US[] = { // Uruguay const PrepopulatedEngine* const engines_UY[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &duckduckgo, &ecosia, @@ -957,8 +957,8 @@ const PrepopulatedEngine* const engines_UY[] = { // Venezuela const PrepopulatedEngine* const engines_VE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo_es, &duckduckgo, &yandex_com, @@ -966,17 +966,17 @@ const PrepopulatedEngine* const engines_VE[] = { // Vietnam const PrepopulatedEngine* const engines_VN[] = { - &google, + &you, &coccoc, - &bing, + &swisscows, &yahoo, &baidu, }; // Yemen const PrepopulatedEngine* const engines_YE[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &yandex_com, @@ -984,8 +984,8 @@ const PrepopulatedEngine* const engines_YE[] = { // South Africa const PrepopulatedEngine* const engines_ZA[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -993,8 +993,8 @@ const PrepopulatedEngine* const engines_ZA[] = { // Zimbabwe const PrepopulatedEngine* const engines_ZW[] = { - &google, - &bing, + &you, + &swisscows, &yahoo, &duckduckgo, &ecosia, @@ -1384,7 +1384,7 @@ std::vector> GetPrepopulatedEngines( } if (default_search_provider_index) { const auto itr = - base::ranges::find(t_urls, duckduckgo.id, &TemplateURLData::prepopulate_id); + base::ranges::find(t_urls, you.id, &TemplateURLData::prepopulate_id); *default_search_provider_index = itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr); } diff --git a/chrome/browser/android/locale/locale_template_url_loader.cc b/chrome/browser/android/locale/locale_template_url_loader.cc index d44abf2732581..ed10b70403619 100644 --- a/chrome/browser/android/locale/locale_template_url_loader.cc +++ b/chrome/browser/android/locale/locale_template_url_loader.cc @@ -65,12 +65,12 @@ jboolean LocaleTemplateUrlLoader::LoadTemplateUrls(JNIEnv* env) { template_url_service_->GetTemplateURLForKeyword(data_url->keyword()); bool exists = matching_url != nullptr; if (!exists && - data_url->prepopulate_id == TemplateURLPrepopulateData::google.id) { + data_url->prepopulate_id == TemplateURLPrepopulateData::you.id) { auto existing_urls = template_url_service_->GetTemplateURLs(); for (auto* existing_url : existing_urls) { if (existing_url->prepopulate_id() == - TemplateURLPrepopulateData::google.id) { + TemplateURLPrepopulateData::you.id) { matching_url = existing_url; exists = true; break; @@ -108,7 +108,7 @@ void LocaleTemplateUrlLoader::OverrideDefaultSearchProvider(JNIEnv* env) { const TemplateURL* current_dsp = template_url_service_->GetDefaultSearchProvider(); if (!current_dsp || - current_dsp->prepopulate_id() != TemplateURLPrepopulateData::google.id) { + current_dsp->prepopulate_id() != TemplateURLPrepopulateData::you.id) { return; } @@ -131,7 +131,7 @@ void LocaleTemplateUrlLoader::SetGoogleAsDefaultSearch(JNIEnv* env) { TemplateURL* turl = FindURLByPrepopulateID(template_url_service_->GetTemplateURLs(), - TemplateURLPrepopulateData::google.id); + TemplateURLPrepopulateData::you.id); if (turl) { template_url_service_->SetUserSelectedDefaultSearchProvider(turl); }