From 4a5ef1ca3dbfb24a1553abbd7bf8b96af64ebd21 Mon Sep 17 00:00:00 2001 From: Kartik Kumar Date: Thu, 30 Jan 2025 09:43:42 +0100 Subject: [PATCH] Build Fixes --- src/build/config/android/config.gni | 4 +- .../chrome/browser/extensions/Extensions.java | 43 ++------ .../chrome/browser/ntp/NewTabPageLayout.java | 2 +- .../chrome/browser/ui/RootUiCoordinator.java | 2 +- .../browser/download/download_crx_util.cc | 20 ++-- .../browser/extensions/extensions_android.cc | 52 ++++----- .../browser/feed/FeedSwipeRefreshLayout.java | 9 +- .../chrome/browser/ui/appmenu/AppMenu.java | 41 +++---- .../ui/appmenu/AppMenuCoordinatorFactory.java | 2 +- .../ui/appmenu/AppMenuExtensionOpener.java | 37 +++---- .../search_engines/prepopulated_engines.json | 14 +-- .../generated_marketing_snippets.cc | 4 +- .../search_engine_countries-inc.cc | 22 ++-- .../search_engines/search_engine_type.h | 2 +- .../template_url_starter_pack_data.cc | 8 +- src/package-lock.json | 101 ++---------------- src/tools/gritsettings/resource_ids.spec | 2 +- 17 files changed, 117 insertions(+), 248 deletions(-) diff --git a/src/build/config/android/config.gni b/src/build/config/android/config.gni index 695f8206a59..547ba61cc2c 100644 --- a/src/build/config/android/config.gni +++ b/src/build/config/android/config.gni @@ -225,10 +225,10 @@ if (is_android || is_chromeos) { # Forced Android versionCode - android_override_version_code = "28" + android_override_version_code = "30" # Forced Android versionName - android_override_version_name = "0.24" + android_override_version_name = "0.26" # The path to the keystore to use for signing builds. android_keystore_path = default_android_keystore_path diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/extensions/Extensions.java b/src/chrome/android/java/src/org/chromium/chrome/browser/extensions/Extensions.java index 45a7ecd7507..0147a9b8bc8 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/extensions/Extensions.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/extensions/Extensions.java @@ -10,9 +10,6 @@ import java.util.List; import java.util.ArrayList; import org.chromium.chrome.browser.ntp.NewTabPageLayout; -import android.content.Context; -import android.widget.Toast; -import org.chromium.base.ContextUtils; import org.jni_zero.CalledByNative; import org.jni_zero.NativeMethods; @@ -31,15 +28,7 @@ public static ArrayList getExtensionsInfo() { JSONArray array = new JSONArray(jsonString); for (int i = 0; i < array.length(); i++) { JSONObject obj = array.getJSONObject(i); - - // Validate the url - // String popupUrl = obj.getString("popup_url"); - // Log.w("Extensions", "popupUrl: " + popupUrl); - // if (!isUrlfromOfficialStore(popupUrl)) { - // Log.w("Extensions", "Invalid popup url: " + popupUrl); - // continue; - // } - + // Decode base64 icon String iconBase64 = obj.getString("icon_base64"); Bitmap icon = null; @@ -48,12 +37,13 @@ public static ArrayList getExtensionsInfo() { icon = BitmapFactory.decodeByteArray(iconBytes, 0, iconBytes.length); } result.add(new ExtensionInfo( - obj.getString("id"), - obj.getString("name"), - obj.getString("description"), - obj.getString("popup_url"), - obj.getString("widget_url"), - icon)); + obj.getString("id"), + obj.getString("name"), + obj.getString("description"), + obj.getString("popup_url"), + obj.getString("widget_url"), + icon + )); } } catch (JSONException e) { Log.e("ExtensionInfo", "Error parsing JSON", e); @@ -61,20 +51,6 @@ public static ArrayList getExtensionsInfo() { return result; } - public static boolean isUrlfromOfficialStore(String url) { - return url.contains("github.com/wootzapp/ext-store"); - } - - public static void installExtension(String url) { - Log.w("Extensions", "url: " + url); - if (!isUrlfromOfficialStore(url)) { - Context context = ContextUtils.getApplicationContext(); - Toast.makeText(context, "Install from official store", Toast.LENGTH_SHORT).show(); - return; - } - ExtensionsJni.get().installExtension(url); - } - public static void uninstallExtension(String extensionId) { Log.d("Extensions", "Uninstalling extension: " + extensionId); ExtensionsJni.get().uninstallExtension(extensionId); @@ -88,7 +64,6 @@ public static void uninstallExtension(String extensionId) { @NativeMethods interface Natives { String getExtensionsInfo(); - void installExtension(String url); void uninstallExtension(String extensionId); } -} +} \ No newline at end of file diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/src/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java index 8358ee6bd10..a20461c4f19 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java @@ -1570,7 +1570,7 @@ protected void onDetachedFromWindow() { cleanupWebContents(); } - public void cleanupWebContents() { + private void cleanupWebContents() { Log.d(TAG, "cleanupWebContents called"); if (mCurrentWebContents != null) { Log.d(TAG, "Destroying current WebContents"); diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/src/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java index 6ef2b2acf25..0158d850c7e 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java @@ -2300,4 +2300,4 @@ public void destroyActivityForTesting() { // a test is done. Just null it out to give an effect of |onDestroy| being invoked. mActivity = null; } -} \ No newline at end of file +} diff --git a/src/chrome/browser/download/download_crx_util.cc b/src/chrome/browser/download/download_crx_util.cc index ef5049198fa..1380e7f3bdf 100644 --- a/src/chrome/browser/download/download_crx_util.cc +++ b/src/chrome/browser/download/download_crx_util.cc @@ -9,13 +9,13 @@ #include #include "chrome/browser/android/tab_android.h" -#include "chrome/browser/ui/android/tab_model/tab_model.h" -#include "chrome/browser/ui/android/tab_model/tab_model_list.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/android/tab_model/tab_model.h" +#include "chrome/browser/ui/android/tab_model/tab_model_list.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -63,8 +63,9 @@ std::unique_ptr CreateExtensionInstallPrompt( // } // web_contents = browser->tab_strip_model()->GetActiveWebContents(); for (const TabModel* model : TabModelList::models()) { - if (model->IsActiveModel()) + if (model->IsActiveModel()) { web_contents = model->GetActiveWebContents(); + } } } return std::make_unique(web_contents); @@ -95,10 +96,9 @@ scoped_refptr CreateCrxInstaller( scoped_refptr installer( extensions::CrxInstaller::Create( - service, - CreateExtensionInstallPrompt(profile, download_item), - nullptr)); // woots exts patch - // WebstoreInstaller::GetAssociatedApproval(download_item))); + service, CreateExtensionInstallPrompt(profile, download_item), + nullptr)); // woots exts patch + // WebstoreInstaller::GetAssociatedApproval(download_item))); installer->set_error_on_unsupported_requirements(true); installer->set_delete_source(true); @@ -114,9 +114,9 @@ scoped_refptr CreateCrxInstaller( // DownloadItem::TARGET_DISPOSITION_PROMPT) // return false; - // if (download_item.GetMimeType() == extensions::Extension::kMimeType || - // extensions::UserScript::IsURLUserScript(download_item.GetURL(), - // download_item.GetMimeType())) { +// if (download_item.GetMimeType() == extensions::Extension::kMimeType || +// extensions::UserScript::IsURLUserScript(download_item.GetURL(), +// download_item.GetMimeType())) { // return true; // } else { // return false; diff --git a/src/chrome/browser/extensions/extensions_android.cc b/src/chrome/browser/extensions/extensions_android.cc index ee9fba2710b..9585f3d61d4 100644 --- a/src/chrome/browser/extensions/extensions_android.cc +++ b/src/chrome/browser/extensions/extensions_android.cc @@ -140,41 +140,35 @@ void JNI_Extensions_InstallExtension( Profile* profile = ProfileManager::GetActiveUserProfile(); if (!profile) { LOG(ERROR) << "No Active Profile FOUND"; - return; + return; } extensions::ExtensionService* extension_service = extensions::ExtensionSystem::Get(profile)->extension_service(); - if (!extension_service) { - LOG(ERROR) << "Extension Service Not Available"; - return; - } - - } - - - - void JNI_Extensions_UninstallExtension( - JNIEnv * env, - const base::android::JavaParamRef& j_extension_id) { - std::string extension_id = - base::android::ConvertJavaStringToUTF8(env, j_extension_id); - - + if (!extension_service) { + LOG(ERROR) << "Extension Service Not Available"; + return; + } +} - Profile* profile = ProfileManager::GetActiveUserProfile(); - if (!profile) { - return; - } +void JNI_Extensions_UninstallExtension( + JNIEnv* env, + const base::android::JavaParamRef& j_extension_id) { + std::string extension_id = + base::android::ConvertJavaStringToUTF8(env, j_extension_id); - extensions::ExtensionService* extension_service = - extensions::ExtensionSystem::Get(profile)->extension_service(); - if (!extension_service) { - return; - } + Profile* profile = ProfileManager::GetActiveUserProfile(); + if (!profile) { + return; + } + extensions::ExtensionService* extension_service = + extensions::ExtensionSystem::Get(profile)->extension_service(); + if (!extension_service) { + return; + } - extension_service->UninstallExtension( - extension_id, extensions::UNINSTALL_REASON_USER_INITIATED, nullptr); - } + extension_service->UninstallExtension( + extension_id, extensions::UNINSTALL_REASON_USER_INITIATED, nullptr); +} diff --git a/src/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java b/src/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java index 93b530b665d..1684e77fcef 100644 --- a/src/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java +++ b/src/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java @@ -227,15 +227,18 @@ public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (mTarget == null) { return; } + + // Force the target view to be measured with a very large height + // This will push any bottom content (like search box) off screen mTarget.measure( MeasureSpec.makeMeasureSpec( getMeasuredWidth() - getPaddingLeft() - getPaddingRight(), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec( - 0, // Height of 0 with UNSPECIFIED lets the view size to its content - MeasureSpec.UNSPECIFIED)); // UNSPECIFIED allows the view to determine its own size + Integer.MAX_VALUE, + MeasureSpec.AT_MOST)); - // Update the measured dimensions to match the child's height plus padding + // Set the measured dimension to be very tall setMeasuredDimension(getMeasuredWidth(), Math.max(mTarget.getMeasuredHeight() + getPaddingTop() + getPaddingBottom(), getMeasuredHeight())); } diff --git a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java index d8841504e35..b5d85621469 100644 --- a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java @@ -3,6 +3,7 @@ // found in the LICENSE file. package org.chromium.chrome.browser.ui.appmenu; + import android.app.Activity; import android.animation.Animator; import android.animation.AnimatorSet; @@ -269,7 +270,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { } private View createContentView(boolean test) { - Log.d("KRITAGYA", "KRITAGYA: createContentView"); + NestedScrollView scrollView = new NestedScrollView(getContext()); scrollView.setLayoutParams(new ViewGroup.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, @@ -299,7 +300,7 @@ private View createWebViewContainer() { alreadyReverted = true; activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); } - Log.d("KRITAGYA", "KRITAGYA: createWebViewContainer"); + FrameLayout viewWrapper = new FrameLayout(getContext()); FrameLayout.LayoutParams wrapperParams = new FrameLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, @@ -373,7 +374,7 @@ public void getOutline(View view, Outline outline) { private void returnToAppMenu() { View view = getView(); if (view != null) { - + view.findViewById(R.id.app_menu_grid).setVisibility(View.VISIBLE); view.findViewById(R.id.app_menu_extensions).setVisibility(View.VISIBLE); view.findViewById(R.id.extensions_divider).setVisibility(View.VISIBLE); @@ -386,7 +387,6 @@ private void returnToAppMenu() { @Override public void onActivityCreated(Bundle savedInstanceState) { - Log.d("KRITAGYA", "KRITAGYA: onActivityCreated"); super.onActivityCreated(savedInstanceState); View parent = (View) getView().getParent(); @@ -458,6 +458,16 @@ private void createExtensionsRow() { HorizontalScrollView scrollView = view.findViewById(R.id.extensions_scroll_view); LinearLayout parent = view.findViewById(R.id.app_menu_extensions); + // Check if we're in incognito mode + if (mHandler != null && mHandler.getActivityTab() != null && + mHandler.getActivityTab().isIncognito()) { + // Hide all extension-related views in incognito mode + extensionsDivider.setVisibility(View.GONE); + scrollView.setVisibility(View.GONE); + parent.setVisibility(View.GONE); + return; + } + extensionsContainer.removeAllViews(); List extensionsInfo = Extensions.getExtensionsInfo(); @@ -515,7 +525,6 @@ private void createExtensionsRow() { scrollView.setLayoutParams(scrollParams); // Enable horizontal scrolling - Log.d("KRITAGYA", "KRITAGYA: scrollView.setHorizontalScrollBarEnabled"); scrollView.setHorizontalScrollBarEnabled(true); } @@ -534,14 +543,6 @@ private ImageButton createRoundButton(Context context) { } private void openWebsite(String url) { - if (!Extensions.isUrlfromOfficialStore(url)) { - Context context = getContext(); - if (context != null) { - Toast.makeText(context, "Install from official store", Toast.LENGTH_SHORT).show(); - return; - } - } - if (mHandler != null) { LoadUrlParams params = new LoadUrlParams(url); Tab tab = mHandler.getActivityTab(); @@ -576,13 +577,11 @@ private void deleteExtension(int extensionIndex) { } private void openExtensionWebView(int index) { - Log.d("KRITAGYA", "KRITAGYA: openExtensionWebView"); View view = getView(); if (view != null) { view.findViewById(R.id.app_menu_grid).setVisibility(View.GONE); view.findViewById(R.id.app_menu_extensions).setVisibility(View.GONE); view.findViewById(R.id.extensions_divider).setVisibility(View.GONE); - FrameLayout webViewContainer = view.findViewById(R.id.web_view_container); webViewContainer.setVisibility(View.VISIBLE); @@ -594,7 +593,6 @@ private void openExtensionWebView(int index) { mWebViewContainer = createWebViewContainer(); } webViewFrame.addView(mWebViewContainer); - // Load the extension URL String popupUrl = Extensions.getExtensionsInfo().get(index).getPopupUrl(); mWebContents.getNavigationController().loadUrl(new LoadUrlParams(popupUrl)); @@ -603,8 +601,7 @@ private void openExtensionWebView(int index) { @Override public void onDestroyView() { - Log.d("KRITAGYA", "KRITAGYA: onDestroyView"); - + super.onDestroyView(); if (mWebContents != null) { mWebContents.destroy(); @@ -613,10 +610,9 @@ public void onDestroyView() { mContentView = null; mThinWebView = null; mWebViewContainer = null; - if(mWebViewContainer == null){ + if (mWebViewContainer == null) { Activity activity = getActivity(); if (activity != null && alreadyReverted) { - Log.d("KRITAGYA", "KRITAGYA: reverting back to unspecifed"); activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); alreadyReverted = false; } @@ -624,7 +620,6 @@ public void onDestroyView() { } public boolean onBackPressed() { - Log.d("KRITAGYA", "KRITAGYA: onBackPressed"); View view = getView(); if (view != null && view.findViewById(R.id.app_menu_grid).getVisibility() == View.GONE) { returnToAppMenu(); @@ -652,7 +647,6 @@ public void show(@NonNull FragmentManager manager, @Nullable String tag) { @Override public void dismiss() { - Log.d("KRITAGYA", "KRITAGYA: dismiss called"); Log.d(TAG, "dismiss called"); try { super.dismiss(); @@ -860,7 +854,6 @@ public void showExtensionWebViewDirectly(String extensionId, AppMenuExtensionOpe } public void closeExtensionBottomSheet(AppMenuExtensionOpener extensionOpener) { - extensionOpener.closeBottomSheet(); } @@ -999,5 +992,5 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa return view; } - + } diff --git a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java index ba4898b850d..9569000c1f3 100644 --- a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java +++ b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java @@ -77,4 +77,4 @@ public static AppMenuCoordinator createAppMenuCoordinator( public static void setExceptionReporter(Callback reporter) { AppMenuCoordinatorImpl.setExceptionReporter(reporter); } -} \ No newline at end of file +} diff --git a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuExtensionOpener.java b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuExtensionOpener.java index cab342df8a1..3b13f7596ca 100644 --- a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuExtensionOpener.java +++ b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuExtensionOpener.java @@ -49,19 +49,15 @@ public class AppMenuExtensionOpener { private WebContents mCurrentWebContents; private static BottomSheetDialog mBottomSheetDialog; private Activity mActivity; - public AppMenuExtensionOpener(Context context, WindowAndroid windowAndroid) { mContext = context; mWindowAndroid = windowAndroid; if (context instanceof Activity) { mActivity = (Activity) context; } - } public void openExtension(String extensionId) { - - Log.d("KRITAGYA", "KRITAGYA: openExtension"); int index = findExtensionIndexById(extensionId); if (index == -1) { Log.e(TAG, "JANGID: Extension not found with ID: " + extensionId); @@ -79,7 +75,6 @@ public void openExtension(String extensionId) { private View createWebView(int index) { try { - Log.d("KRITAGYA", "KRITAGYA: createWebView"); Profile profile = ProfileManager.getLastUsedRegularProfile(); mCurrentWebContents = WebContentsFactory.createWebContents(profile, true, false); ContentView contentView = ContentView.createContentView(mContext, null, mCurrentWebContents); @@ -117,7 +112,6 @@ private View createWebView(int index) { } private void showWebViewInBottomSheet(View webView) { - Log.d("KRITAGYA", "KRITAGYA: showWebViewInBottomSheet"); Activity activity = (Activity) mContext; if (activity != null) { activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); @@ -127,35 +121,34 @@ private void showWebViewInBottomSheet(View webView) { FrameLayout webViewContainer = bottomSheetView.findViewById(R.id.web_view_container); webViewContainer.addView(webView); - + // Set initial wrap_content height ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); bottomSheetView.setLayoutParams(params); - + mBottomSheetDialog.setContentView(bottomSheetView); - - BottomSheetBehavior behavior = BottomSheetBehavior.from((View) bottomSheetView.getParent()); - behavior.setState(BottomSheetBehavior.STATE_EXPANDED); + BottomSheetBehavior behavior = BottomSheetBehavior.from((View) bottomSheetView.getParent()); + behavior.setState(BottomSheetBehavior.STATE_EXPANDED); mBottomSheetDialog.setCanceledOnTouchOutside(true); - + mBottomSheetDialog.setOnCancelListener(dialog -> { - + resetOrientation(); }); - + mBottomSheetDialog.setOnDismissListener(dialog -> { - + resetOrientation(); }); - + behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() { @Override public void onStateChanged(View bottomSheet, int newState) { if (newState == BottomSheetBehavior.STATE_HIDDEN) { - + resetOrientation(); mBottomSheetDialog.dismiss(); } @@ -184,8 +177,8 @@ public void onGlobalLayout() { int screenHeight = rootView.getHeight(); int keypadHeight = screenHeight - r.bottom; - if (keypadHeight > screenHeight * 0.15) { // Keyboard is visible - bottomSheetView.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT; + if (keypadHeight > screenHeight * 0.10) { // Keyboard is visible + bottomSheetView.getLayoutParams().height = screenHeight - keypadHeight - 200; } else { bottomSheetView.getLayoutParams().height = defaultHeight; } @@ -193,11 +186,9 @@ public void onGlobalLayout() { } }); - // Set window soft input mode mBottomSheetDialog.getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - mBottomSheetDialog.show(); } @@ -206,7 +197,6 @@ private void resetOrientation() { mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); } } - private int findExtensionIndexById(String extensionId) { ArrayList extensions = Extensions.getExtensionsInfo(); @@ -219,10 +209,9 @@ private int findExtensionIndexById(String extensionId) { } public static void closeBottomSheet() { - Log.d(TAG, "KRITAGYA: closeBottomSheet"); if (mBottomSheetDialog != null && mBottomSheetDialog.isShowing()) { Context context = mBottomSheetDialog.getContext(); mBottomSheetDialog.dismiss(); } } -} +} \ No newline at end of file diff --git a/src/components/search_engines/prepopulated_engines.json b/src/components/search_engines/prepopulated_engines.json index 653870ae8af..cdb763081d2 100644 --- a/src/components/search_engines/prepopulated_engines.json +++ b/src/components/search_engines/prepopulated_engines.json @@ -73,13 +73,13 @@ "id": 3 }, - "wootz": { - "name": "Wootz", - "keyword": "search.wootz.com", - "favicon_url": "https://cdn.search.wootz.com/serp/favicon.ico", - "search_url": "https://search.wootz.com/search?q={searchTerms}", - "suggest_url": "https://search.wootz.com/api/suggest?q={searchTerms}", - "type": "SEARCH_ENGINE_WOOTZ", + "brave": { + "name": "Brave", + "keyword": "search.brave.com", + "favicon_url": "https://cdn.search.brave.com/serp/favicon.ico", + "search_url": "https://search.brave.com/search?q={searchTerms}", + "suggest_url": "https://search.brave.com/api/suggest?q={searchTerms}", + "type": "SEARCH_ENGINE_BRAVE", "id": 109 }, diff --git a/src/components/search_engines/search_engine_choice/generated_marketing_snippets.cc b/src/components/search_engines/search_engine_choice/generated_marketing_snippets.cc index 936cf07b0ca..4e2d54dc487 100644 --- a/src/components/search_engines/search_engine_choice/generated_marketing_snippets.cc +++ b/src/components/search_engines/search_engine_choice/generated_marketing_snippets.cc @@ -15,8 +15,8 @@ int GetMarketingSnippetResourceId(const std::u16string& engine_keyword) { if (engine_keyword == TemplateURLPrepopulateData::bing.keyword) { return IDS_BING_SEARCH_DESCRIPTION; } - if (engine_keyword == TemplateURLPrepopulateData::wootz.keyword) { - return IDS_WOOTZ_SEARCH_DESCRIPTION; + if (engine_keyword == TemplateURLPrepopulateData::brave.keyword) { + return IDS_BRAVE_SEARCH_DESCRIPTION; } if (engine_keyword == TemplateURLPrepopulateData::duckduckgo.keyword) { return IDS_DUCKDUCKGO_SEARCH_DESCRIPTION; diff --git a/src/components/search_engines/search_engine_countries-inc.cc b/src/components/search_engines/search_engine_countries-inc.cc index b80b057d7ee..6c8ffb9e7df 100644 --- a/src/components/search_engines/search_engine_countries-inc.cc +++ b/src/components/search_engines/search_engine_countries-inc.cc @@ -72,7 +72,7 @@ constexpr EngineAndTier engines_AR[] = { constexpr EngineAndTier engines_AT[] = { {SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &duckduckgo}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &ecosia}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kRemainingEngines, &yahoo_at}, @@ -101,7 +101,7 @@ constexpr EngineAndTier engines_BA[] = { // Belgium constexpr EngineAndTier engines_BE[] = { {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &ecosia}, @@ -269,7 +269,7 @@ constexpr EngineAndTier engines_DE[] = { {SearchEngineTier::kTopEngines, &ecosia}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &bing}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kRemainingEngines, &yahoo_de}, {SearchEngineTier::kRemainingEngines, &metager_de}, {SearchEngineTier::kRemainingEngines, &qwant}, @@ -339,7 +339,7 @@ constexpr EngineAndTier engines_EG[] = { // Spain constexpr EngineAndTier engines_ES[] = { {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &ecosia}, @@ -351,7 +351,7 @@ constexpr EngineAndTier engines_ES[] = { // Finland constexpr EngineAndTier engines_FI[] = { {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &ecosia}, @@ -372,7 +372,7 @@ constexpr EngineAndTier engines_FO[] = { // France constexpr EngineAndTier engines_FR[] = { {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &ecosia}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &qwant}, @@ -466,7 +466,7 @@ constexpr EngineAndTier engines_ID[] = { constexpr EngineAndTier engines_IE[] = { {SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &duckduckgo}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &yahoo_uk}, {SearchEngineTier::kRemainingEngines, &ecosia}, @@ -526,7 +526,7 @@ constexpr EngineAndTier engines_IS[] = { constexpr EngineAndTier engines_IT[] = { {SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &bing}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &ecosia}, {SearchEngineTier::kRemainingEngines, &yahoo_it}, @@ -712,7 +712,7 @@ constexpr EngineAndTier engines_MK[] = { constexpr EngineAndTier engines_MT[] = { {SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &bing}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &ecosia}, {SearchEngineTier::kRemainingEngines, &yahoo_emea}, @@ -828,7 +828,7 @@ constexpr EngineAndTier engines_PK[] = { // Poland constexpr EngineAndTier engines_PL[] = { {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &ecosia}, @@ -849,7 +849,7 @@ constexpr EngineAndTier engines_PR[] = { // Portugal constexpr EngineAndTier engines_PT[] = { {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &wootz}, + {SearchEngineTier::kTopEngines, &brave}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &ecosia}, diff --git a/src/components/search_engines/search_engine_type.h b/src/components/search_engines/search_engine_type.h index 9ec67fe2198..1c440671336 100644 --- a/src/components/search_engines/search_engine_type.h +++ b/src/components/search_engines/search_engine_type.h @@ -86,7 +86,7 @@ enum SearchEngineType { SEARCH_ENGINE_YEP = 67, SEARCH_ENGINE_NONA = 68, SEARCH_ENGINE_QUENDU = 69, - SEARCH_ENGINE_WOOTZ = 70, + SEARCH_ENGINE_BRAVE = 70, SEARCH_ENGINE_KARMA = 71, SEARCH_ENGINE_YOU = 72, SEARCH_ENGINE_STARTER_PACK_ASK_GOOGLE = 73, diff --git a/src/components/search_engines/template_url_starter_pack_data.cc b/src/components/search_engines/template_url_starter_pack_data.cc index 82dd0fab2e7..3af1a3a6af6 100644 --- a/src/components/search_engines/template_url_starter_pack_data.cc +++ b/src/components/search_engines/template_url_starter_pack_data.cc @@ -25,8 +25,8 @@ const StarterPackEngine bookmarks = { .name_message_id = IDS_SEARCH_ENGINES_STARTER_PACK_BOOKMARKS_NAME, .keyword_message_id = IDS_SEARCH_ENGINES_STARTER_PACK_BOOKMARKS_KEYWORD, .favicon_url = nullptr, - .search_url = "wootzapp://bookmarks/?q={searchTerms}", - .destination_url = "wootzapp://bookmarks", + .search_url = "chrome://bookmarks/?q={searchTerms}", + .destination_url = "chrome://bookmarks", .id = StarterPackID::kBookmarks, .type = SEARCH_ENGINE_STARTER_PACK_BOOKMARKS, }; @@ -35,8 +35,8 @@ const StarterPackEngine history = { .name_message_id = IDS_SEARCH_ENGINES_STARTER_PACK_HISTORY_NAME, .keyword_message_id = IDS_SEARCH_ENGINES_STARTER_PACK_HISTORY_KEYWORD, .favicon_url = nullptr, - .search_url = "wootzapp://history/?q={searchTerms}", - .destination_url = "wootzapp://history", + .search_url = "chrome://history/?q={searchTerms}", + .destination_url = "chrome://history", .id = StarterPackID::kHistory, .type = SEARCH_ENGINE_STARTER_PACK_HISTORY, }; diff --git a/src/package-lock.json b/src/package-lock.json index 4aeef8af35d..6d4343c5148 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -6267,7 +6267,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz", "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==", - "devOptional": true, + "dev": true, "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" @@ -6485,7 +6485,7 @@ "version": "7.1.25", "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz", "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==", - "devOptional": true, + "dev": true, "dependencies": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -9062,16 +9062,6 @@ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", "dev": true }, - "node_modules/builtins": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", - "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", - "dev": true, - "peer": true, - "dependencies": { - "semver": "^7.0.0" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -11349,52 +11339,6 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "peer": true, - "engines": { - "node": ">=4" - } - }, "node_modules/eslint-plugin-import": { "version": "2.27.5", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", @@ -11491,32 +11435,6 @@ "eslint": ">=7" } }, - "node_modules/eslint-plugin-n": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", - "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", - "dev": true, - "peer": true, - "dependencies": { - "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", - "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" - }, - "engines": { - "node": ">=12.22.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, "node_modules/eslint-plugin-no-unsanitized": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.2.tgz", @@ -18751,6 +18669,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -18762,6 +18681,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -18770,13 +18690,6 @@ "react": "^18.2.0" } }, - "node_modules/react-is": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz", - "integrity": "sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==", - "dev": true, - "peer": true - }, "node_modules/react-json-view-lite": { "version": "0.9.8", "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-0.9.8.tgz", @@ -18817,7 +18730,7 @@ "version": "7.2.9", "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", - "devOptional": true, + "dev": true, "dependencies": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -18842,7 +18755,7 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "devOptional": true + "dev": true }, "node_modules/react-router": { "version": "5.3.4", @@ -19174,6 +19087,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz", "integrity": "sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==", + "dev": true, "dependencies": { "@babel/runtime": "^7.9.2" } @@ -20054,6 +19968,7 @@ "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0" } diff --git a/src/tools/gritsettings/resource_ids.spec b/src/tools/gritsettings/resource_ids.spec index 0f1d5da97b0..f02335800aa 100644 --- a/src/tools/gritsettings/resource_ids.spec +++ b/src/tools/gritsettings/resource_ids.spec @@ -593,7 +593,7 @@ "includes": [4760], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/throttle/resources.grd": { - "META": {"sizes": {"includes": [20]}}, + "META": {"sizes": {"includes": [50]}}, "includes": [4770], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/omnibox/resources.grd": {