chromium/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch

From 44a40a76c7f7a0a4effc7a99ce25825a3dbec0ab Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Thu, 19 Sep 2024 17:54:08 +0300
Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page

---
 chrome/app/generated_resources.grd                 |  2 --
 chrome/app/resources/generated_resources_be.xtb    |  4 ++--
 chrome/app/resources/generated_resources_en-GB.xtb |  2 +-
 chrome/app/resources/generated_resources_ru.xtb    |  2 +-
 chrome/app/resources/generated_resources_uk.xtb    |  2 +-
 chrome/browser/history/top_sites_factory.cc        |  4 ++--
 .../browser/resources/new_tab_page/lens_form.html  |  1 +
 chrome/browser/resources/new_tab_page/lens_form.ts |  6 +++---
 .../resources/new_tab_page/lens_upload_dialog.css  |  2 +-
 .../resources/new_tab_page/lens_upload_dialog.html |  8 ++++----
 chrome/browser/resources/new_tab_page/logo.css     |  5 +----
 chrome/browser/resources/new_tab_page/logo.ts      |  2 +-
 chrome/browser/search/search.cc                    |  7 +++++++
 chrome/browser/search/search.h                     |  2 ++
 .../ui/webui/new_tab_page/new_tab_page_ui.cc       |  5 +++++
 components/search/search.cc                        | 14 ++++++++++++++
 components/search/search.h                         |  7 +++++++
 components/search_engines/keyword_table.cc         |  4 ++++
 .../search_engines/prepopulated_engines.json       | 11 ++++++-----
 .../search_engines/search_engine_countries-inc.cc  |  9 +++++----
 .../search_engines/template_url_data_util.cc       |  6 +++++-
 .../template_url_prepopulate_data.cc               |  9 ++++++++-
 .../cr_components/searchbox/searchbox.html         |  7 +++++++
 23 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b597bcdb0c..4da22b920c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7741,10 +7741,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- NTP -->
       <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Google is the default search engine, and the Material Design UI is enabled.">
-        Search Google or type a URL
       </message>
       <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_SHORT" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Google is the default search engine, and short hint text is enabled.">
-        Search Google
       </message>
       <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MULTIMODAL" desc="The text displayed in the multimodal searchbox when it is empty. It is meant to invite the user to add a text query to the existing image query in order to issue a 'multimodal' (image + text) query.">
         Add to your search
diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb
index ba534914bc..b79dc7658e 100644
--- a/chrome/app/resources/generated_resources_be.xtb
+++ b/chrome/app/resources/generated_resources_be.xtb
@@ -9737,7 +9737,7 @@
 <translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation>
 <translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation>
 <translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation>
-<translation id="8049122382261047457">Шукайце відарысы з дапамогай Google Аб’ектыва</translation>
+<translation id="8049122382261047457">Шукайце відарысы</translation>
 <translation id="8049705080247101012">У Google пашырэнне "<ph name="EXTENSION_NAME" />" абазначана як шкоднае. Яго ўсталяванне было прадухілена</translation>
 <translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation>
 <translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation>
@@ -11485,4 +11485,4 @@
 <translation id="997143476478634194">Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце.</translation>
 <translation id="99731366405731005">Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце <ph name="LINK1_BEGIN" />Сінхранізацыю Chrome<ph name="LINK1_END" />. <ph name="LINK2_BEGIN" />Даведацца больш<ph name="LINK2_END" /></translation>
 <translation id="998747458861718449">Пра&amp;верыць</translation>
-</translationbundle>
\ No newline at end of file
+</translationbundle>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb
index 969e766c16..a6e8f938ef 100644
--- a/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -9748,7 +9748,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
 <translation id="8048728378294435881">Back up your stuff and use it on any device</translation>
 <translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation>
 <translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation>
-<translation id="8049122382261047457">Search any image with Google Lens</translation>
+<translation id="8049122382261047457">Search any image</translation>
 <translation id="8049705080247101012">Google has flagged '<ph name="EXTENSION_NAME" />' as malicious, and installation has been prevented</translation>
 <translation id="8049948037269924837">Touchpad reverse scrolling</translation>
 <translation id="8050038245906040378">Microsoft Commercial Code Signing</translation>
diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb
index 2f8d4a2a1f..75c68ba79b 100644
--- a/chrome/app/resources/generated_resources_ru.xtb
+++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -9741,7 +9741,7 @@
 <translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation>
 <translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation>
 <translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation>
-<translation id="8049122382261047457">Ищите по изображениям с Google Объективом</translation>
+<translation id="8049122382261047457">Ищите по изображениям</translation>
 <translation id="8049705080247101012">Google заблокировал установку потенциально опасной программы (<ph name="EXTENSION_NAME" />).</translation>
 <translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation>
 <translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb
index 06937a3c8d..0a9a6a2b5b 100644
--- a/chrome/app/resources/generated_resources_uk.xtb
+++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -9751,7 +9751,7 @@
 <translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation>
 <translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation>
 <translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation>
-<translation id="8049122382261047457">Шукайте будь-яке зображення через Google Об’єктив</translation>
+<translation id="8049122382261047457">Шукайте будь-яке зображення</translation>
 <translation id="8049705080247101012">Система Google позначила розширення <ph name="EXTENSION_NAME" /> як шкідливе та заборонила встановлення</translation>
 <translation id="8049948037269924837">Зворотне прокручування на сенсорній панелі</translation>
 <translation id="8050038245906040378">Підписування комерційного коду Microsoft</translation>
diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc
index cd1caf3f41..5f0b99b14f 100644
--- a/chrome/browser/history/top_sites_factory.cc
+++ b/chrome/browser/history/top_sites_factory.cc
@@ -59,7 +59,7 @@ struct RawPrepopulatedPage {
                          // roughly match favicon).
 };
 
-#if !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID) && 0 // no prepopulated
 // Android does not use prepopulated pages.
 const RawPrepopulatedPage kRawPrepopulatedPages[] = {
     {
@@ -74,7 +74,7 @@ const RawPrepopulatedPage kRawPrepopulatedPages[] = {
 void InitializePrepopulatedPageList(
     Profile* profile,
     history::PrepopulatedPageList* prepopulated_pages) {
-#if !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID) && 0 // no prepopulated
   DCHECK(prepopulated_pages);
   PrefService* pref_service = profile->GetPrefs();
   bool hide_web_store_icon =
diff --git a/chrome/browser/resources/new_tab_page/lens_form.html b/chrome/browser/resources/new_tab_page/lens_form.html
index 72bd92c5ab..2604d9c0dd 100644
--- a/chrome/browser/resources/new_tab_page/lens_form.html
+++ b/chrome/browser/resources/new_tab_page/lens_form.html
@@ -11,6 +11,7 @@
 <form id="urlForm"
       .action="${this.uploadUrlAction_}"
       method="GET">
+  <input name="rpt" .value="imageview"></input>
   <input name="url" .value="${this.uploadUrl_}"></input>
   <input name="ep" .value="${this.uploadUrlEntrypoint_}"></input>
   <input name="hl" .value="${this.language_}"></input>
diff --git a/chrome/browser/resources/new_tab_page/lens_form.ts b/chrome/browser/resources/new_tab_page/lens_form.ts
index cc89f05912..020eb1413d 100644
--- a/chrome/browser/resources/new_tab_page/lens_form.ts
+++ b/chrome/browser/resources/new_tab_page/lens_form.ts
@@ -11,14 +11,14 @@ import {getCss} from './lens_form.css.js';
 import {getHtml} from './lens_form.html.js';
 
 /** Lens service endpoint for the Upload by File action. */
-const SCOTTY_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/upload';
-const DIRECT_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/v3/upload';
+const SCOTTY_UPLOAD_FILE_ACTION: string = 'https://yandex.ru/images/search';
+const DIRECT_UPLOAD_FILE_ACTION: string = 'https://yandex.ru/images/search';
 
 /** Entrypoint for the upload by file action. */
 const UPLOAD_FILE_ENTRYPOINT: string = 'cntpubb';
 
 /** Lens service endpoint for the Upload by URL action. */
-const UPLOAD_BY_URL_ACTION: string = 'https://lens.google.com/uploadbyurl';
+const UPLOAD_BY_URL_ACTION: string = 'https://yandex.ru/images/search';
 
 /** Entrypoint for the upload by url action. */
 const UPLOAD_URL_ENTRYPOINT: string = 'cntpubu';
diff --git a/chrome/browser/resources/new_tab_page/lens_upload_dialog.css b/chrome/browser/resources/new_tab_page/lens_upload_dialog.css
index bde20d9920..ef6dfbdd24 100644
--- a/chrome/browser/resources/new_tab_page/lens_upload_dialog.css
+++ b/chrome/browser/resources/new_tab_page/lens_upload_dialog.css
@@ -109,7 +109,7 @@
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  height: 280px;
+  height: 110px;
   padding: 20px;
   position: relative;
   width: 100%;
diff --git a/chrome/browser/resources/new_tab_page/lens_upload_dialog.html b/chrome/browser/resources/new_tab_page/lens_upload_dialog.html
index 9e02b5266c..7a4fbfb75f 100644
--- a/chrome/browser/resources/new_tab_page/lens_upload_dialog.html
+++ b/chrome/browser/resources/new_tab_page/lens_upload_dialog.html
@@ -22,7 +22,7 @@
       ` : ''}
       <!-- Normal state -->
       ${this.isNormalOrError_ ? html`
-        <div class="drag-drop-title-container">
+        <!-- <div class="drag-drop-title-container">
           <div id="dragDropIllustration"></div>
           <div class="drag-drop-title">
             <span id="dragText">$i18n{lensSearchUploadDialogDragTitle}</span>
@@ -33,13 +33,13 @@
               $i18n{lensSearchUploadDialogUploadFileTitle}
             </span>
           </div>
-        </div>
+		</div>//-->
         <div id="urlUploadContainer">
-          <div id="sectionDivider">
+				<!-- <div id="sectionDivider">
             <div class="divider-line"></div>
             <div id="orLabel">$i18n{lensSearchUploadDialogOrText}</div>
             <div class="divider-line"></div>
-          </div>
+				</div>//-->
           <div id="inputContainer">
             <input id="inputBox" autocomplete="false" autocorrect="false"
                 placeholder="$i18n{lensSearchUploadDialogTextPlaceholder}"
diff --git a/chrome/browser/resources/new_tab_page/logo.css b/chrome/browser/resources/new_tab_page/logo.css
index f7c8d5c6e4..71e8d5455d 100644
--- a/chrome/browser/resources/new_tab_page/logo.css
+++ b/chrome/browser/resources/new_tab_page/logo.css
@@ -33,10 +33,7 @@
 }
 
 :host([single-colored]) #logo {
-  -webkit-mask-image: url(./icons/google_logo.svg);
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-size: 100%;
-  background-color: var(--ntp-logo-color);
+  background-image: url(./icons/google_logo.svg);
 }
 
 :host(:not([single-colored])) #logo {
diff --git a/chrome/browser/resources/new_tab_page/logo.ts b/chrome/browser/resources/new_tab_page/logo.ts
index 412c9bcf2c..e0c27819a5 100644
--- a/chrome/browser/resources/new_tab_page/logo.ts
+++ b/chrome/browser/resources/new_tab_page/logo.ts
@@ -216,7 +216,7 @@ export class LogoElement extends CrLitElement {
   }
 
   private computeShowLogo_(): boolean {
-    return !!this.loaded_ && !this.showDoodle_;
+    return false; //!!this.loaded_ && !this.showDoodle_;
   }
 
   private computeShowDoodle_(): boolean {
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 40c586fb4f..fc046edf27 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -174,6 +174,8 @@ struct NewTabURLDetails {
 
 #if BUILDFLAG(IS_ANDROID)
     const GURL local_url;
+    #elif 1 // Always use built-in NTp page
+        const GURL local_url(chrome::kChromeUINewTabPageURL);
 #else
     const bool default_is_google = DefaultSearchProviderIsGoogle(profile);
     const GURL local_url(default_is_google
@@ -240,6 +242,11 @@ bool DefaultSearchProviderIsGoogle(Profile* profile) {
       TemplateURLServiceFactory::GetForProfile(profile));
 }
 
+bool DefaultSearchProviderIsYandex(Profile* profile) {
+  return DefaultSearchProviderIsYandex(
+      TemplateURLServiceFactory::GetForProfile(profile));
+}
+
 bool IsNTPOrRelatedURL(const GURL& url, Profile* profile) {
   if (!url.is_valid()) {
     return false;
diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h
index c7ae65114f..5859d72731 100644
--- a/chrome/browser/search/search.h
+++ b/chrome/browser/search/search.h
@@ -21,6 +21,8 @@ namespace search {
 // Returns whether Google is selected as the default search engine.
 bool DefaultSearchProviderIsGoogle(Profile* profile);
 
+bool DefaultSearchProviderIsYandex(Profile* profile);
+
 // Returns true if |url| corresponds to a New Tab page or its service worker.
 bool IsNTPOrRelatedURL(const GURL& url, Profile* profile);
 
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
index 7e67bf7265..b43a0d7bf8 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -35,6 +35,7 @@
 #include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_provider_logos/logo_service_factory.h"
+#include "chrome/browser/search/search.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/sync/sync_service_factory.h"
 #include "chrome/browser/themes/theme_service_factory.h"
@@ -424,6 +425,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
       base::NumberToString(
           ntp_features::kNtpCalendarModuleWindowEndDeltaParam.Get().InHours()));
 
+  source->AddBoolean(
+      "googleLensForYandex",
+       search::DefaultSearchProviderIsYandex(profile));
+
   SearchboxHandler::SetupWebUIDataSource(
       source, profile,
       /*enable_voice_search=*/true,
diff --git a/components/search/search.cc b/components/search/search.cc
index a7167fae92..67d36156c5 100644
--- a/components/search/search.cc
+++ b/components/search/search.cc
@@ -34,4 +34,18 @@ bool TemplateURLIsGoogle(const TemplateURL* template_url,
          template_url->GetEngineType(search_terms_data) == SEARCH_ENGINE_GOOGLE;
 }
 
+bool DefaultSearchProviderIsYandex(
+    const TemplateURLService* template_url_service) {
+  if (!template_url_service)
+    return false;
+  return TemplateURLIsYandex(template_url_service->GetDefaultSearchProvider(),
+                             template_url_service->search_terms_data());
+}
+
+bool TemplateURLIsYandex(const TemplateURL* template_url,
+                         const SearchTermsData& search_terms_data) {
+  return template_url != nullptr &&
+         template_url->GetEngineType(search_terms_data) == SEARCH_ENGINE_YANDEX;
+}
+
 }  // namespace search
diff --git a/components/search/search.h b/components/search/search.h
index 98572faa77..cfb6727848 100644
--- a/components/search/search.h
+++ b/components/search/search.h
@@ -22,6 +22,13 @@ bool DefaultSearchProviderIsGoogle(
 // Returns whether supplied template URL is Google template URL.
 bool TemplateURLIsGoogle(const TemplateURL* template_url,
                          const SearchTermsData& search_terms_data);
+
+bool DefaultSearchProviderIsYandex(
+    const TemplateURLService* template_url_service);
+
+// Returns whether supplied template URL is Google template URL.
+bool TemplateURLIsYandex(const TemplateURL* template_url,
+                         const SearchTermsData& search_terms_data);
 }  // namespace search
 
 #endif  // COMPONENTS_SEARCH_SEARCH_H_
diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc
index d4a9489e93..6cd91a2147 100644
--- a/components/search_engines/keyword_table.cc
+++ b/components/search_engines/keyword_table.cc
@@ -173,7 +173,9 @@ void BindURLToStatement(const TemplateURLData& data,
   s->BindString(starting_column + 16, data.search_url_post_params);
   s->BindString(starting_column + 17, data.suggestions_url_post_params);
   s->BindString(starting_column + 18, data.image_url_post_params);
+#if 0 // Disable new tab overriding by search engines
   s->BindString(starting_column + 19, data.new_tab_url);
+#endif
   s->BindTime(starting_column + 20, data.last_visited);
   s->BindBool(starting_column + 21, data.created_from_play_api);
   s->BindInt(starting_column + 22, static_cast<int>(data.is_active));
@@ -541,7 +543,9 @@ bool KeywordTable::GetKeywordDataFromStatement(sql::Statement& s,
   data->SetURL(s.ColumnString(4));
   data->suggestions_url = s.ColumnString(10);
   data->image_url = s.ColumnString(16);
+#if 0 // Disable new tab overriding by search engines
   data->new_tab_url = s.ColumnString(20);
+#endif
   data->search_url_post_params = s.ColumnString(17);
   data->suggestions_url_post_params = s.ColumnString(18);
   data->image_url_post_params = s.ColumnString(19);
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 40a13e733c..a4911f5394 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -855,7 +855,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
     },
@@ -868,6 +868,7 @@
       "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
       "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,
       "regulatory_extensions": [
@@ -893,7 +894,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
     },
@@ -907,7 +908,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
     },
@@ -920,7 +921,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
     },
@@ -934,7 +935,7 @@
       "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
       "image_url": "https://yandex.ua/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.ua/chrome/newtab",
+	  "new_tab_url": "chrome://new-tab-page",
       "type": "SEARCH_ENGINE_YANDEX",
       "id": 15
     },
diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
index 468d6ca0ef..029c2c2966 100644
--- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc
@@ -38,6 +38,7 @@ struct EngineAndTier {
 
 // Default (for countries with no better engine set)
 constexpr EngineAndTier engines_default[] = {
+    {SearchEngineTier::kTopEngines, &yandex_com},
     {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &bing},
     {SearchEngineTier::kTopEngines, &yahoo},
@@ -174,8 +175,8 @@ constexpr EngineAndTier engines_BR[] = {
 
 // Belarus
 constexpr EngineAndTier engines_BY[] = {
-    {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &yandex_by},
+    {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &bing},
     {SearchEngineTier::kTopEngines, &duckduckgo},
     {SearchEngineTier::kTopEngines, &mail_ru},
@@ -499,9 +500,9 @@ constexpr EngineAndTier engines_IN[] = {
 
 // Iraq
 constexpr EngineAndTier engines_IQ[] = {
+    {SearchEngineTier::kTopEngines, &yandex_tr},
     {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &bing},
-    {SearchEngineTier::kTopEngines, &yandex_tr},
     {SearchEngineTier::kTopEngines, &yahoo},
     {SearchEngineTier::kTopEngines, &duckduckgo},
 };
@@ -595,8 +596,8 @@ constexpr EngineAndTier engines_KW[] = {
 
 // Kazakhstan
 constexpr EngineAndTier engines_KZ[] = {
-    {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &yandex_kz},
+    {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &bing},
     {SearchEngineTier::kTopEngines, &mail_ru},
     {SearchEngineTier::kTopEngines, &yahoo},
@@ -1012,8 +1013,8 @@ constexpr EngineAndTier engines_TN[] = {
 
 // Turkey
 constexpr EngineAndTier engines_TR[] = {
-    {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &yandex_tr},
+    {SearchEngineTier::kTopEngines, &google},
     {SearchEngineTier::kTopEngines, &yahoo_tr},
     {SearchEngineTier::kTopEngines, &bing},
     {SearchEngineTier::kTopEngines, &duckduckgo},
diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc
index 2616957c6a..54ee4d1811 100644
--- a/components/search_engines/template_url_data_util.cc
+++ b/components/search_engines/template_url_data_util.cc
@@ -80,10 +80,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary(
   if (string_value) {
     result->image_translate_url = *string_value;
   }
+#if 0 // Disable new tab overriding by search engines
   string_value = dict.FindString(DefaultSearchManager::kNewTabURL);
   if (string_value) {
     result->new_tab_url = *string_value;
   }
+#endif
   string_value = dict.FindString(DefaultSearchManager::kContextualSearchURL);
   if (string_value) {
     result->contextual_search_url = *string_value;
@@ -351,7 +353,7 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromPrepopulatedEngine(
       ToU16StringView(engine.name), ToU16StringView(engine.keyword),
       ToStringView(engine.search_url), ToStringView(engine.suggest_url),
       ToStringView(engine.image_url), ToStringView(engine.image_translate_url),
-      ToStringView(engine.new_tab_url),
+      ToStringView(nullptr), //ToStringView(engine.new_tab_url),
       ToStringView(engine.contextual_search_url), ToStringView(engine.logo_url),
       ToStringView(engine.doodle_url),
       ToStringView(engine.search_url_post_params),
@@ -443,10 +445,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromOverrideDictionary(
     if (string_value) {
       image_translate_url = *string_value;
     }
+#if 0 // Disable new tab overriding by search engines
     string_value = engine_dict.FindString("new_tab_url");
     if (string_value) {
       new_tab_url = *string_value;
     }
+#endif
     string_value = engine_dict.FindString("contextual_search_url");
     if (string_value) {
       contextual_search_url = *string_value;
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 208ef4af2b..f30c8a9cb5 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -84,6 +84,13 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,
   std::shuffle(t_urls.begin(), t_urls.end(), generator);
 
   CHECK_LE(t_urls.size(), kMaxEeaPrepopulatedEngines);
+
+  const auto itr =
+        base::ranges::find(t_urls, yandex_ru.id, &TemplateURLData::prepopulate_id);
+  if (itr == t_urls.end()) {
+    t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(yandex_com));
+  }
+
   return t_urls;
 }
 
@@ -324,7 +331,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(
     PrefService* prefs,
     search_engines::SearchEngineChoiceService* search_engine_choice_service) {
   return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service,
-                                        google.id,
+                                        yandex_ru.id,
                                         /*use_first_as_fallback=*/true);
 }
 
diff --git a/ui/webui/resources/cr_components/searchbox/searchbox.html b/ui/webui/resources/cr_components/searchbox/searchbox.html
index 0df21dda3f..b0c38b2b8b 100644
--- a/ui/webui/resources/cr_components/searchbox/searchbox.html
+++ b/ui/webui/resources/cr_components/searchbox/searchbox.html
@@ -1,4 +1,11 @@
 <style include="cr-icons">
+  #voiceSearchButton {
+    visibility: hidden;
+  }
+  #lensSearchButton {
+    visibility: visible;
+  }
+
   :host {
     /* Embedders should define --cr-searchbox-min-width. */
     --cr-searchbox-width: var(--cr-searchbox-min-width);
-- 
2.47.0