diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index 7897b464460..69a3d7eef82 100644 --- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -82,7 +82,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE private static final String PREF_SHOW_AUTOCOMPLETE_IN_ADDRESS_BAR = "show_autocomplete_in_address_bar"; private static final String PREF_AUTOCOMPLETE_TOP_SITES = "autocomplete_top_sites"; - private static final String PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES = "autocomplete_brave_suggested_sites"; private static final String PREF_SOCIAL_BLOCKING_GOOGLE = "social_blocking_google"; private static final String PREF_SOCIAL_BLOCKING_FACEBOOK = "social_blocking_facebook"; private static final String PREF_SOCIAL_BLOCKING_TWITTER = "social_blocking_twitter"; @@ -115,7 +114,7 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE PREF_CLOSE_TABS_ON_EXIT, PREF_SEND_P3A, PREF_SEND_CRASH_REPORTS, PREF_BRAVE_STATS_USAGE_PING, PREF_SHOW_AUTOCOMPLETE_IN_ADDRESS_BAR, PREF_SEARCH_SUGGESTIONS, PREF_AUTOCOMPLETE_TOP_SITES, - PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES, PREF_USAGE_STATS, PREF_PRIVACY_SANDBOX}; + PREF_USAGE_STATS, PREF_PRIVACY_SANDBOX}; private final int STRICT = 0; private final int STANDARD = 1; @@ -132,7 +131,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE private BraveDialogPreference mBlockCrosssiteCookies; private ChromeSwitchPreference mShowAutocompleteInAddressBar; private ChromeSwitchPreference mAutocompleteTopSites; - private ChromeSwitchPreference mAutocompleteBraveSuggestedSites; private ChromeSwitchPreference mHttpsePref; private ChromeSwitchPreference mDeAmpPref; private ChromeSwitchPreference mHttpsFirstModePref; @@ -256,9 +254,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE mAutocompleteTopSites = (ChromeSwitchPreference) findPreference(PREF_AUTOCOMPLETE_TOP_SITES); mAutocompleteTopSites.setOnPreferenceChangeListener(this); - mAutocompleteBraveSuggestedSites = (ChromeSwitchPreference) findPreference(PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES); - mAutocompleteBraveSuggestedSites.setOnPreferenceChangeListener(this); - mSocialBlockingCategory = (PreferenceCategory) findPreference(PREF_BRAVE_SOCIAL_BLOCKING_SECTION); mSocialBlockingCategory.setOnPreferenceChangeListener(this); @@ -411,16 +406,11 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE boolean autocompleteEnabled = (boolean) newValue; mSearchSuggestions.setEnabled(autocompleteEnabled); mAutocompleteTopSites.setEnabled(autocompleteEnabled); - mAutocompleteBraveSuggestedSites.setEnabled(autocompleteEnabled); UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(BravePref.AUTOCOMPLETE_ENABLED, autocompleteEnabled); } else if (PREF_AUTOCOMPLETE_TOP_SITES.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(BravePref.TOP_SITE_SUGGESTIONS_ENABLED, (boolean) newValue); - } else if (PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES.equals(key)) { - UserPrefs.get(Profile.getLastUsedRegularProfile()) - .setBoolean( - BravePref.BRAVE_SUGGESTED_SITE_SUGGESTIONS_ENABLED, (boolean) newValue); } else if (PREF_SOCIAL_BLOCKING_GOOGLE.equals(key)) { BravePrefServiceBridge.getInstance().setThirdPartyGoogleLoginEnabled( (boolean) newValue); @@ -558,9 +548,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE mAutocompleteTopSites.setChecked( UserPrefs.get(Profile.getLastUsedRegularProfile()) .getBoolean(BravePref.TOP_SITE_SUGGESTIONS_ENABLED)); - mAutocompleteBraveSuggestedSites.setChecked( - UserPrefs.get(Profile.getLastUsedRegularProfile()) - .getBoolean(BravePref.BRAVE_SUGGESTED_SITE_SUGGESTIONS_ENABLED)); mClearBrowsingDataOnExit.setChecked( sharedPreferences.getBoolean(PREF_CLEAR_ON_EXIT, false)); @@ -570,7 +557,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE mShowAutocompleteInAddressBar.setChecked(autocompleteEnabled); mSearchSuggestions.setEnabled(autocompleteEnabled); mAutocompleteTopSites.setEnabled(autocompleteEnabled); - mAutocompleteBraveSuggestedSites.setEnabled(autocompleteEnabled); mFingerprntLanguagePref.setChecked(UserPrefs.get(Profile.getLastUsedRegularProfile()) .getBoolean(BravePref.REDUCE_LANGUAGE_ENABLED)); if (mCookieListOptInPageAndroidHandler != null) { diff --git a/android/java/res/xml/brave_privacy_preferences.xml b/android/java/res/xml/brave_privacy_preferences.xml index ee2d7fbe247..6e646083471 100644 --- a/android/java/res/xml/brave_privacy_preferences.xml +++ b/android/java/res/xml/brave_privacy_preferences.xml @@ -142,11 +142,6 @@ android:order="25" android:title="@string/autocomplete_top_sites_title" android:persistent="false"/> - Top sites - - Suggested sites - Browsing History diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index b6cd7264bc0..dc340335424 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -155,8 +155,6 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() { settings_api::PrefType::PREF_TYPE_BOOLEAN; (*s_brave_allowlist)[omnibox::kTopSiteSuggestionsEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - (*s_brave_allowlist)[omnibox::kBraveSuggestedSiteSuggestionsEnabled] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; (*s_brave_allowlist)[omnibox::kHistorySuggestionsEnabled] = settings_api::PrefType::PREF_TYPE_BOOLEAN; (*s_brave_allowlist)[omnibox::kBookmarkSuggestionsEnabled] = diff --git a/browser/resources/settings/brave_appearance_page/toolbar.html b/browser/resources/settings/brave_appearance_page/toolbar.html index d45d1db56f3..c14d17653ce 100644 --- a/browser/resources/settings/brave_appearance_page/toolbar.html +++ b/browser/resources/settings/brave_appearance_page/toolbar.html @@ -29,10 +29,6 @@ pref="{{prefs.brave.top_site_suggestions_enabled}}" label="$i18n{appearanceSettingsUseTopSiteSuggestions}"> - - Show top sites in autocomplete - - Show suggested sites in autocomplete - Save Data Online diff --git a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc index 146a11f5e4f..6a5e18e7e80 100644 --- a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc +++ b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc @@ -108,8 +108,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, IDS_SETTINGS_APPEARANCE_SETTINGS_SHOW_AUTOCOMPLETE_IN_ADDRESS_BAR}, {"appearanceSettingsUseTopSiteSuggestions", IDS_SETTINGS_APPEARANCE_SETTINGS_USE_AUTOCOMPLETE_TOP_SITES}, - {"appearanceSettingsUseBraveSuggestedSiteSuggestions", - IDS_SETTINGS_APPEARANCE_SETTINGS_USE_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES}, {"appearanceSettingsUseHistorySuggestions", IDS_SETTINGS_APPEARANCE_SETTINGS_USE_AUTOCOMPLETE_HISTORY}, {"appearanceSettingsUseBookmarkSuggestions", diff --git a/chromium_src/components/omnibox/browser/autocomplete_controller.cc b/chromium_src/components/omnibox/browser/autocomplete_controller.cc index 8082134ac88..72a6b912925 100644 --- a/chromium_src/components/omnibox/browser/autocomplete_controller.cc +++ b/chromium_src/components/omnibox/browser/autocomplete_controller.cc @@ -11,7 +11,6 @@ #include "brave/components/omnibox/browser/brave_shortcuts_provider.h" #include "brave/components/omnibox/browser/promotion_provider.h" #include "brave/components/omnibox/browser/promotion_utils.h" -#include "brave/components/omnibox/browser/suggested_sites_provider.h" #include "brave/components/omnibox/browser/topsites_provider.h" #include "components/omnibox/browser/clipboard_provider.h" #include "components/omnibox/browser/history_cluster_provider.h" @@ -26,7 +25,6 @@ using brave_search_conversion::IsBraveSearchConversionFetureEnabled; #define ShortcutsProvider BraveShortcutsProvider #define BRAVE_AUTOCOMPLETE_CONTROLLER_AUTOCOMPLETE_CONTROLLER \ providers_.push_back(new TopSitesProvider(provider_client_.get())); \ - providers_.push_back(new SuggestedSitesProvider(provider_client_.get())); \ if (IsBraveSearchConversionFetureEnabled() && \ !provider_client_->IsOffTheRecord()) \ providers_.push_back(new PromotionProvider(provider_client_.get())); diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn index 74821daef43..f20b2f99992 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -15,7 +15,6 @@ source_set("unit_tests") { "//brave/components/omnibox/browser/brave_search_provider_unittest.cc", "//brave/components/omnibox/browser/brave_shortcuts_provider_unittest.cc", "//brave/components/omnibox/browser/omnibox_autocomplete_unittest.cc", - "//brave/components/omnibox/browser/suggested_sites_provider_unittest.cc", "//brave/components/omnibox/browser/topsites_provider_unittest.cc", "promotion_unittest.cc", ] diff --git a/components/omnibox/browser/brave_omnibox_prefs.cc b/components/omnibox/browser/brave_omnibox_prefs.cc index 7d22292f5fe..5b9bc6a8001 100644 --- a/components/omnibox/browser/brave_omnibox_prefs.cc +++ b/components/omnibox/browser/brave_omnibox_prefs.cc @@ -17,12 +17,6 @@ const char kAutocompleteEnabled[] = "brave.autocomplete_enabled"; // |TopsitesProvider|. const char kTopSiteSuggestionsEnabled[] = "brave.top_site_suggestions_enabled"; -// Determines whether suggested sites show up in the omnibox results. See -// |SuggestedSitesProvider|. -// Note: These suggestions include referral codes. -const char kBraveSuggestedSiteSuggestionsEnabled[] = - "brave.brave_suggested_site_suggestions_enabled"; - // Determines whether history suggestions show up in the omnibox results. This // includes: // 1. Results from the |HistoryURLProvider|, which aren't "What-You-Typed". @@ -40,7 +34,6 @@ const char kBookmarkSuggestionsEnabled[] = void RegisterBraveProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(kAutocompleteEnabled, true); registry->RegisterBooleanPref(kTopSiteSuggestionsEnabled, true); - registry->RegisterBooleanPref(kBraveSuggestedSiteSuggestionsEnabled, false); registry->RegisterBooleanPref(kHistorySuggestionsEnabled, true); registry->RegisterBooleanPref(kBookmarkSuggestionsEnabled, true); } diff --git a/components/omnibox/browser/brave_omnibox_prefs.h b/components/omnibox/browser/brave_omnibox_prefs.h index 94d9d2ebe0a..7fdd020ca10 100644 --- a/components/omnibox/browser/brave_omnibox_prefs.h +++ b/components/omnibox/browser/brave_omnibox_prefs.h @@ -12,7 +12,6 @@ namespace omnibox { extern const char kAutocompleteEnabled[]; extern const char kTopSiteSuggestionsEnabled[]; -extern const char kBraveSuggestedSiteSuggestionsEnabled[]; extern const char kHistorySuggestionsEnabled[]; extern const char kBookmarkSuggestionsEnabled[]; diff --git a/components/omnibox/browser/omnibox_autocomplete_unittest.cc b/components/omnibox/browser/omnibox_autocomplete_unittest.cc index 2dbe5272735..91742abe569 100644 --- a/components/omnibox/browser/omnibox_autocomplete_unittest.cc +++ b/components/omnibox/browser/omnibox_autocomplete_unittest.cc @@ -27,8 +27,3 @@ class OmniboxAutocompleteUnitTest : public testing::Test { TEST_F(OmniboxAutocompleteUnitTest, TopSiteSuggestionsEnabledTest) { EXPECT_TRUE(prefs()->GetBoolean(omnibox::kTopSiteSuggestionsEnabled)); } - -TEST_F(OmniboxAutocompleteUnitTest, BraveSuggestedSiteSuggestionsEnabledTest) { - EXPECT_FALSE( - prefs()->GetBoolean(omnibox::kBraveSuggestedSiteSuggestionsEnabled)); -} diff --git a/components/omnibox/browser/promotion_unittest.cc b/components/omnibox/browser/promotion_unittest.cc index 67133dbc407..162ba1a2f69 100644 --- a/components/omnibox/browser/promotion_unittest.cc +++ b/components/omnibox/browser/promotion_unittest.cc @@ -44,8 +44,6 @@ class OmniboxPromotionTest : public testing::Test { RegisterPrefs(pref_service_.registry()); omnibox::RegisterBraveProfilePrefs(pref_service_.registry()); pref_service_.SetBoolean(omnibox::kTopSiteSuggestionsEnabled, false); - pref_service_.SetBoolean(omnibox::kBraveSuggestedSiteSuggestionsEnabled, - false); scoped_default_locale_ = std::make_unique("en_US"); diff --git a/components/omnibox/browser/sources.gni b/components/omnibox/browser/sources.gni index 6cbc61c4039..3433014c6ab 100644 --- a/components/omnibox/browser/sources.gni +++ b/components/omnibox/browser/sources.gni @@ -23,11 +23,6 @@ brave_components_omnibox_browser_sources = [ "//brave/components/omnibox/browser/promotion_provider.h", "//brave/components/omnibox/browser/promotion_utils.cc", "//brave/components/omnibox/browser/promotion_utils.h", - "//brave/components/omnibox/browser/suggested_sites_match.cc", - "//brave/components/omnibox/browser/suggested_sites_match.h", - "//brave/components/omnibox/browser/suggested_sites_provider.cc", - "//brave/components/omnibox/browser/suggested_sites_provider.h", - "//brave/components/omnibox/browser/suggested_sites_provider_data.cc", "//brave/components/omnibox/browser/topsites_provider.cc", "//brave/components/omnibox/browser/topsites_provider.h", "//brave/components/omnibox/browser/topsites_provider_data.cc", diff --git a/components/omnibox/browser/suggested_sites_match.cc b/components/omnibox/browser/suggested_sites_match.cc deleted file mode 100644 index 50f03e9424b..00000000000 --- a/components/omnibox/browser/suggested_sites_match.cc +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/components/omnibox/browser/suggested_sites_match.h" - -// This is the provider for Brave Suggested Sites -SuggestedSitesMatch::SuggestedSitesMatch(const std::string& match_string, - const GURL& destination_url, - const GURL& stripped_destination_url, - const std::u16string& display) - : match_string_(match_string), - destination_url_(destination_url), - stripped_destination_url_(stripped_destination_url), - display_(display) {} - -SuggestedSitesMatch::SuggestedSitesMatch(const SuggestedSitesMatch& other) { - match_string_ = other.match_string_; - destination_url_ = other.destination_url_; - stripped_destination_url_ = other.stripped_destination_url_; - display_ = other.display_; -} - -SuggestedSitesMatch::~SuggestedSitesMatch() = default; diff --git a/components/omnibox/browser/suggested_sites_match.h b/components/omnibox/browser/suggested_sites_match.h deleted file mode 100644 index d7cb50ac578..00000000000 --- a/components/omnibox/browser/suggested_sites_match.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_OMNIBOX_BROWSER_SUGGESTED_SITES_MATCH_H_ -#define BRAVE_COMPONENTS_OMNIBOX_BROWSER_SUGGESTED_SITES_MATCH_H_ - -#include - -#include "url/gurl.h" - -// This is the provider for Brave Suggested Sites -class SuggestedSitesMatch { - public: - SuggestedSitesMatch(const SuggestedSitesMatch& other); - SuggestedSitesMatch(const std::string& match_string, - const GURL& destination_url, - const GURL& stripped_destination_url, - const std::u16string& display); - ~SuggestedSitesMatch(); - std::string match_string_; - GURL destination_url_; - GURL stripped_destination_url_; - std::u16string display_; -}; - -#endif // BRAVE_COMPONENTS_OMNIBOX_BROWSER_SUGGESTED_SITES_MATCH_H_ diff --git a/components/omnibox/browser/suggested_sites_provider.cc b/components/omnibox/browser/suggested_sites_provider.cc deleted file mode 100644 index 84b64f03e7e..00000000000 --- a/components/omnibox/browser/suggested_sites_provider.cc +++ /dev/null @@ -1,108 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/components/omnibox/browser/suggested_sites_provider.h" - -#include -#include - -#include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" -#include "brave/components/omnibox/browser/brave_omnibox_prefs.h" -#include "components/omnibox/browser/autocomplete_input.h" -#include "components/omnibox/browser/autocomplete_provider_client.h" -#include "components/prefs/pref_service.h" - -// As from autocomplete_provider.h: -// Search Secondary Provider (suggestion) | 100++ -const int SuggestedSitesProvider::kRelevance = 100; - - -SuggestedSitesProvider::SuggestedSitesProvider( - AutocompleteProviderClient* client) - : AutocompleteProvider(AutocompleteProvider::TYPE_SEARCH), client_(client) { -} - -void SuggestedSitesProvider::Start(const AutocompleteInput& input, - bool minimal_changes) { - matches_.clear(); - auto* prefs = client_->GetPrefs(); - if (!prefs || - !prefs->GetBoolean(omnibox::kBraveSuggestedSiteSuggestionsEnabled)) { - return; - } - - if (input.focus_type() != metrics::OmniboxFocusType::INTERACTION_DEFAULT || - (input.type() == metrics::OmniboxInputType::EMPTY) || - (input.type() == metrics::OmniboxInputType::QUERY)) { - return; - } - - const std::string input_text = - base::ToLowerASCII(base::UTF16ToUTF8(input.text())); - auto check_add_match = - [&](const SuggestedSitesMatch& match) { - // Don't bother matching until 4 chars, or less if it's an exact match - if (input_text.length() < 4 && - match.match_string_.length() != input_text.length()) { - return; - } - size_t foundPos = match.match_string_.find(input_text); - // We'd normally check for npos here but we want only people that - // really want these suggestions. Example don't suggest bitcoin and - // litecoin for just a coin search. - if (foundPos == 0) { - ACMatchClassifications styles = - StylesForSingleMatch(input_text, - base::UTF16ToASCII(match.display_)); - AddMatch(match, styles); - } - }; - - const auto& suggested_sites = GetSuggestedSites(); - std::for_each(suggested_sites.begin(), suggested_sites.end(), - check_add_match); -} - -SuggestedSitesProvider::~SuggestedSitesProvider() = default; - -// static -ACMatchClassifications SuggestedSitesProvider::StylesForSingleMatch( - const std::string &input_text, - const std::string &site) { - ACMatchClassifications styles; - size_t foundPos = site.find(input_text); - if (std::string::npos == foundPos) { - styles.push_back(ACMatchClassification(0, ACMatchClassification::NONE)); - } else if (foundPos == 0) { - styles.push_back(ACMatchClassification( - 0, ACMatchClassification::URL | ACMatchClassification::MATCH)); - if (site.length() > input_text.length()) { - styles.push_back(ACMatchClassification(input_text.length(), - ACMatchClassification::URL)); - } - } else { - styles.push_back(ACMatchClassification(0, ACMatchClassification::URL)); - styles.push_back(ACMatchClassification( - foundPos, ACMatchClassification::URL | ACMatchClassification::MATCH)); - if (site.length() > foundPos + input_text.length()) { - styles.push_back( - ACMatchClassification(foundPos + input_text.length(), 0)); - } - } - return styles; -} - -void SuggestedSitesProvider::AddMatch(const SuggestedSitesMatch& data, - const ACMatchClassifications& styles) { - AutocompleteMatch match(this, kRelevance + matches_.size(), false, - AutocompleteMatchType::NAVSUGGEST); - match.fill_into_edit = data.display_; - match.destination_url = data.destination_url_; - match.contents = data.display_; - match.contents_class = styles; - match.stripped_destination_url = data.stripped_destination_url_; - matches_.push_back(match); -} diff --git a/components/omnibox/browser/suggested_sites_provider.h b/components/omnibox/browser/suggested_sites_provider.h deleted file mode 100644 index bc802f0f027..00000000000 --- a/components/omnibox/browser/suggested_sites_provider.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_OMNIBOX_BROWSER_SUGGESTED_SITES_PROVIDER_H_ -#define BRAVE_COMPONENTS_OMNIBOX_BROWSER_SUGGESTED_SITES_PROVIDER_H_ - -#include -#include - -#include "base/compiler_specific.h" -#include "base/memory/raw_ptr.h" -#include "brave/components/omnibox/browser/suggested_sites_match.h" -#include "components/omnibox/browser/autocomplete_match.h" -#include "components/omnibox/browser/autocomplete_provider.h" - -class AutocompleteProviderClient; - -// This is the provider for Brave Suggested Sites -class SuggestedSitesProvider : public AutocompleteProvider { - public: - explicit SuggestedSitesProvider(AutocompleteProviderClient* client); - SuggestedSitesProvider(const SuggestedSitesProvider&) = delete; - SuggestedSitesProvider& operator=(const SuggestedSitesProvider&) = delete; - - // AutocompleteProvider: - void Start(const AutocompleteInput& input, bool minimal_changes) override; - - private: - ~SuggestedSitesProvider() override; - - static const int kRelevance; - - const std::vector& GetSuggestedSites(); - void AddMatch(const SuggestedSitesMatch& match, - const ACMatchClassifications& styles); - - static ACMatchClassifications StylesForSingleMatch( - const std::string &input_text, - const std::string &site); - - raw_ptr client_ = nullptr; -}; - -#endif // BRAVE_COMPONENTS_OMNIBOX_BROWSER_SUGGESTED_SITES_PROVIDER_H_ diff --git a/components/omnibox/browser/suggested_sites_provider_data.cc b/components/omnibox/browser/suggested_sites_provider_data.cc deleted file mode 100644 index 3934ee01f5f..00000000000 --- a/components/omnibox/browser/suggested_sites_provider_data.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "base/strings/stringprintf.h" -#include "brave/components/binance/browser/buildflags/buildflags.h" -#include "brave/components/omnibox/browser/suggested_sites_provider.h" - -#include "base/strings/utf_string_conversions.h" - -#if BUILDFLAG(BINANCE_ENABLED) -#include "brave/components/binance/browser/regions.h" -#include "brave/components/ntp_widget_utils/browser/ntp_widget_utils_region.h" -#endif - -namespace { - -std::string GetLocalizedURL(const std::string& query_params, bool str_display) { -#if BUILDFLAG(BINANCE_ENABLED) - const std::string locale = - ntp_widget_utils::FindLocale(::binance::supported_locales, "en"); -#else - const std::string locale = "en"; -#endif - return base::StringPrintf("%sbinance.com/%s/buy-sell-crypto%s", - (str_display ? "" : "https://wwww."), - locale.c_str(), query_params.c_str()); -} - -} // namespace - -const std::vector& -SuggestedSitesProvider::GetSuggestedSites() { - static const std::vector suggested_sites = { - { - SuggestedSitesMatch( - "bitcoin", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=BTC&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=BTC", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=BTC&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "btc", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=BTC&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=BTC", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=BTC&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "ethereum", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=ETH&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=ETH", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=ETH&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "eth", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=ETH&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=ETH", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=ETH&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "litecoin", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=LTC&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=LTC", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=LTC&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "ltc", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=LTC&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=LTC", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=LTC&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "bnb", - GURL(GetLocalizedURL( - "?fiat=USD&crypto=BNB&ref=39346846&utm_source=brave", false)), - GURL(GetLocalizedURL("?crypto=BNB", false)), - base::ASCIIToUTF16(GetLocalizedURL("?crypto=BNB&ref=39346846", - true))) // NOLINT - }, - { - SuggestedSitesMatch( - "bitcoin", - GURL("https://www.binance.us/en/buy-sell-crypto" - "?fiat=USD&crypto=BTC&ref=35089877&utm_source=brave"), - GURL("https://www.binance.us/en/buy-sell-crypto?crypto=BTC"), - u"binance.us/en/" - u"buy-sell-crypto?crypto=BTC&ref=35089877") // NOLINT - }, - { - SuggestedSitesMatch( - "btc", - GURL("https://www.binance.us/en/buy-sell-crypto" - "?fiat=USD&crypto=BTC&ref=35089877&utm_source=brave"), - GURL("https://www.binance.us/en/buy-sell-crypto?crypto=BTC"), - u"binance.us/en/" - u"buy-sell-crypto?crypto=BTC&ref=35089877") // NOLINT - }, - { - SuggestedSitesMatch( - "ethereum", - GURL("https://www.binance.us/en/buy-sell-crypto" - "?fiat=USD&crypto=ETH&ref=35089877&utm_source=brave"), - GURL("https://www.binance.us/en/buy-sell-crypto?crypto=ETH"), - u"binance.us/en/" - u"buy-sell-crypto?crypto=ETH&ref=35089877") // NOLINT - }, - { - SuggestedSitesMatch( - "eth", - GURL("https://www.binance.us/en/buy-sell-crypto" - "?fiat=USD&crypto=ETH&ref=35089877&utm_source=brave"), - GURL("https://www.binance.us/en/buy-sell-crypto?crypto=ETH"), - u"binance.us/en/" - u"buy-sell-crypto?crypto=ETH&ref=35089877") // NOLINT - }, - { - SuggestedSitesMatch( - "bnb", - GURL("https://www.binance.us/en/buy-sell-crypto" - "?fiat=USD&crypto=BNB&ref=35089877&utm_source=brave"), - GURL("https://www.binance.us/en/buy-sell-crypto?crypto=BNB"), - u"binance.us/en/" - u"buy-sell-crypto?crypto=BNB&ref=35089877") // NOLINT - }}; - - return suggested_sites; -} diff --git a/components/omnibox/browser/suggested_sites_provider_unittest.cc b/components/omnibox/browser/suggested_sites_provider_unittest.cc deleted file mode 100644 index a13b1df6281..00000000000 --- a/components/omnibox/browser/suggested_sites_provider_unittest.cc +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "brave/components/omnibox/browser/suggested_sites_provider.h" - -#include "base/strings/utf_string_conversions.h" -#include "brave/components/omnibox/browser/brave_fake_autocomplete_provider_client.h" -#include "brave/components/omnibox/browser/brave_omnibox_prefs.h" -#include "components/omnibox/browser/test_scheme_classifier.h" -#include "components/prefs/testing_pref_service.h" -#include "testing/gtest/include/gtest/gtest.h" - -class SuggestedSitesProviderTest : public testing::Test { - public: - SuggestedSitesProviderTest() - : provider_(new SuggestedSitesProvider(&client_)) { - client_.GetPrefs()->SetBoolean( - omnibox::kBraveSuggestedSiteSuggestionsEnabled, true); - } - - AutocompleteInput CreateAutocompleteInput(base::StringPiece text) { - AutocompleteInput input(base::UTF8ToUTF16(text), - metrics::OmniboxEventProto::OTHER, classifier_); - return input; - } - - PrefService* prefs() { return client_.GetPrefs(); } - - protected: - TestSchemeClassifier classifier_; - BraveFakeAutocompleteProviderClient client_; - scoped_refptr provider_; -}; - -// Checks that the suggested sites list is not empty and that non-ASCII inputs -// do not blow the matcher. -TEST_F(SuggestedSitesProviderTest, SmokeTest) { - provider_->Start(CreateAutocompleteInput(""), true); - EXPECT_TRUE(provider_->matches().empty()); - - provider_->Start(CreateAutocompleteInput("тест"), false); - EXPECT_TRUE(provider_->matches().empty()); - - provider_->Start(CreateAutocompleteInput("테스트"), false); - EXPECT_TRUE(provider_->matches().empty()); -} - -TEST_F(SuggestedSitesProviderTest, FourOrMoreChars) { - provider_->Start(CreateAutocompleteInput("bit"), false); - EXPECT_TRUE(provider_->matches().empty()); - - // Less than 4 chars no match - provider_->Start(CreateAutocompleteInput("bitc"), false); - EXPECT_FALSE(provider_->matches().empty()); -} - -TEST_F(SuggestedSitesProviderTest, LessThan4IfExact) { - provider_->Start(CreateAutocompleteInput("bri"), false); - EXPECT_TRUE(provider_->matches().empty()); - - provider_->Start(CreateAutocompleteInput("ltc"), false); - EXPECT_FALSE(provider_->matches().empty()); -} - -TEST_F(SuggestedSitesProviderTest, OnlyMatchFromStart) { - provider_->Start(CreateAutocompleteInput("bitc"), false); - EXPECT_FALSE(provider_->matches().empty()); - - // Suffix of a match doesn't match - provider_->Start(CreateAutocompleteInput("coin"), false); - EXPECT_TRUE(provider_->matches().empty()); -} - -TEST_F(SuggestedSitesProviderTest, NoMatchingWhenPrefIsOff) { - prefs()->SetBoolean(omnibox::kBraveSuggestedSiteSuggestionsEnabled, false); - provider_->Start(CreateAutocompleteInput("bitc"), false); - EXPECT_TRUE(provider_->matches().empty()); -}