mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-23 15:32:54 +00:00
159 lines
6.8 KiB
Diff
159 lines
6.8 KiB
Diff
From 6681497319c9b7f8d5d27912284ca228408e3d9a Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
Date: Sun, 29 May 2022 22:31:21 +0300
|
|
Subject: [PATCH] Yandex as default search engine
|
|
|
|
Unfortunately, Google has commercially gone away from Russia, where most users of ROSA Linux are located.
|
|
Quality of google.ru search results seems to be degradating a bit.
|
|
|
|
I understand that Google develops Chromium, and so it would be fair if they got some money from adverstisment,
|
|
but, firstly, they have themselves stopped all ads in Russia,
|
|
secondly, influnce of Google is a bad thing because they have to take part in the information war.
|
|
|
|
The patch "Functional new tab page with non-Google search engines" makes chrome://new-tab-page work.
|
|
Yandex's URL which is patched here does not allow to add new items in to the quick access list
|
|
and shows advertisment of the proprietary Yandex browser. I do not want users to install it.
|
|
|
|
A simpler solution would be changing chromium-default-config.json like
|
|
http://git.osmesh.ru/MOS/mos-panel-desktop/src/commit/0f02deea4f7da5ee186433cc71a7ba0193a8f52d/kometa-std-desktop-1.1/chromium.json
|
|
but it would make Yandex.ru be the default even for not Russian users.
|
|
---
|
|
.../search_engines/prepopulated_engines.json | 9 ++++---
|
|
.../template_url_prepopulate_data.cc | 27 ++++++++++---------
|
|
2 files changed, 20 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
|
|
index 5a0bf4d..49be5d2 100644
|
|
--- a/components/search_engines/prepopulated_engines.json
|
|
+++ b/components/search_engines/prepopulated_engines.json
|
|
@@ -557,7 +557,7 @@
|
|
"suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
|
|
"image_url": "https://yandex.by/images/search/?rpt=imageview",
|
|
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
|
|
- "new_tab_url": "https://www.yandex.by/chrome/newtab",
|
|
+ "new_tab_url": "chrome://new-tab-page",
|
|
"type": "SEARCH_ENGINE_YANDEX",
|
|
"id": 15
|
|
},
|
|
@@ -570,6 +570,7 @@
|
|
"suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
|
|
"image_url": "https://yandex.com/images/search?rpt=imageview",
|
|
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
|
|
+ "new_tab_url": "chrome://new-tab-page",
|
|
"type": "SEARCH_ENGINE_YANDEX",
|
|
"id": 15
|
|
},
|
|
@@ -583,7 +584,7 @@
|
|
"suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
|
|
"image_url": "https://yandex.kz/images/search/?rpt=imageview",
|
|
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
|
|
- "new_tab_url": "https://www.yandex.kz/chrome/newtab",
|
|
+ "new_tab_url": "chrome://new-tab-page",
|
|
"type": "SEARCH_ENGINE_YANDEX",
|
|
"id": 15
|
|
},
|
|
@@ -597,7 +598,7 @@
|
|
"suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
|
|
"image_url": "https://yandex.ru/images/search/?rpt=imageview",
|
|
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
|
|
- "new_tab_url": "https://www.yandex.ru/chrome/newtab",
|
|
+ "new_tab_url": "chrome://new-tab-page",
|
|
"type": "SEARCH_ENGINE_YANDEX",
|
|
"id": 15
|
|
},
|
|
@@ -610,7 +611,7 @@
|
|
"suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
|
|
"image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
|
|
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
|
|
- "new_tab_url": "https://www.yandex.com.tr/chrome/newtab",
|
|
+ "new_tab_url": "chrome://new-tab-page",
|
|
"type": "SEARCH_ENGINE_YANDEX",
|
|
"id": 15
|
|
},
|
|
|
|
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
|
|
index bb2366e..6cc8a24 100644
|
|
--- a/components/search_engines/template_url_prepopulate_data.cc
|
|
+++ b/components/search_engines/template_url_prepopulate_data.cc
|
|
@@ -29,6 +29,7 @@ namespace {
|
|
|
|
// Default (for countries with no better engine set)
|
|
const PrepopulatedEngine* const engines_default[] = {
|
|
+ &yandex_com,
|
|
&google,
|
|
&bing,
|
|
&yahoo,
|
|
@@ -156,8 +157,8 @@ const PrepopulatedEngine* const engines_BR[] = {
|
|
|
|
// Belarus
|
|
const PrepopulatedEngine* const engines_BY[] = {
|
|
- &google,
|
|
&yandex_by,
|
|
+ &google,
|
|
&mail_ru,
|
|
&bing,
|
|
&duckduckgo,
|
|
@@ -435,10 +436,10 @@ const PrepopulatedEngine* const engines_IN[] = {
|
|
|
|
// Iraq
|
|
const PrepopulatedEngine* const engines_IQ[] = {
|
|
+ &yandex_tr,
|
|
&google,
|
|
&bing,
|
|
&yahoo,
|
|
- &yandex_tr,
|
|
&duckduckgo,
|
|
};
|
|
|
|
@@ -525,8 +526,8 @@ const PrepopulatedEngine* const engines_KW[] = {
|
|
|
|
// Kazakhstan
|
|
const PrepopulatedEngine* const engines_KZ[] = {
|
|
- &google,
|
|
&yandex_kz,
|
|
+ &google,
|
|
&mail_ru,
|
|
&bing,
|
|
&duckduckgo,
|
|
@@ -795,8 +796,8 @@ const PrepopulatedEngine* const engines_RS[] = {
|
|
|
|
// Russia
|
|
const PrepopulatedEngine* const engines_RU[] = {
|
|
- &google,
|
|
&yandex_ru,
|
|
+ &google,
|
|
&mail_ru,
|
|
&bing,
|
|
&duckduckgo,
|
|
@@ -894,8 +895,8 @@ const PrepopulatedEngine* const engines_TN[] = {
|
|
|
|
// Turkey
|
|
const PrepopulatedEngine* const engines_TR[] = {
|
|
- &google,
|
|
&yandex_tr,
|
|
+ &google,
|
|
&yahoo_tr,
|
|
&bing,
|
|
&duckduckgo,
|
|
@@ -1381,12 +1382,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
|
|
t_urls = GetPrepopulationSetFromCountryID(
|
|
country_codes::GetCountryIDFromPrefs(prefs));
|
|
}
|
|
- if (default_search_provider_index) {
|
|
- const auto itr =
|
|
- base::ranges::find(t_urls, google.id, &TemplateURLData::prepopulate_id);
|
|
- *default_search_provider_index =
|
|
- itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr);
|
|
- }
|
|
+ /* Making yandex_ru be the first in "const PrepopulatedEngine* const engines_RU[]"
|
|
+ * makes it be the first item in chrome://settings/search,
|
|
+ * but Google is still chosen by default.
|
|
+ * Removed code calculated the distance between 0 and Google's position
|
|
+ * and assign that position to default_search_provider_index,
|
|
+ * so that Google still was the default search engine.
|
|
+ * Instead, just use the first search engine as the default one.
|
|
+ */
|
|
+ if (default_search_provider_index) *default_search_provider_index = 0;
|
|
return t_urls;
|
|
}
|
|
|