-
Notifications
You must be signed in to change notification settings - Fork 922
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added search promotion button in omnibox
- Loading branch information
Showing
22 changed files
with
976 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+793 Bytes
.../default_100_percent/brave/brave_search_conversion_button_brave_search_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.72 KB
.../default_200_percent/brave/brave_search_conversion_button_brave_search_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. | ||
|
|
||
| source_set("browser_tests") { | ||
| testonly = true | ||
| defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] | ||
|
|
||
| sources = [ "//brave/browser/ui/views/location_bar/brave_location_bar_view_browsertest.cc" ] | ||
|
|
||
| deps = [ | ||
| "//base", | ||
| "//brave/components/brave_search_conversion", | ||
| "//chrome/browser", | ||
| "//chrome/browser/search_engines", | ||
| "//chrome/browser/ui", | ||
| "//chrome/common", | ||
| "//chrome/test", | ||
| "//chrome/test:test_support", | ||
| "//components/prefs", | ||
| "//ui/base:test_support", | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
194 changes: 194 additions & 0 deletions
194
browser/ui/views/location_bar/brave_location_bar_view_browsertest.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| /* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include "brave/browser/ui/views/location_bar/brave_location_bar_view.h" | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include "base/run_loop.h" | ||
| #include "base/test/bind.h" | ||
| #include "base/test/scoped_feature_list.h" | ||
| #include "brave/browser/ui/views/location_bar/brave_search_conversion/promotion_button_controller.h" | ||
| #include "brave/browser/ui/views/location_bar/brave_search_conversion/promotion_button_view.h" | ||
| #include "brave/components/brave_search_conversion/features.h" | ||
| #include "brave/components/brave_search_conversion/pref_names.h" | ||
| #include "brave/components/search_engines/brave_prepopulated_engines.h" | ||
| #include "chrome/browser/search_engines/template_url_service_factory.h" | ||
| #include "chrome/browser/ui/browser.h" | ||
| #include "chrome/browser/ui/tabs/tab_strip_model.h" | ||
| #include "chrome/browser/ui/view_ids.h" | ||
| #include "chrome/browser/ui/views/frame/browser_view.h" | ||
| #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | ||
| #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | ||
| #include "chrome/test/base/in_process_browser_test.h" | ||
| #include "chrome/test/base/interactive_test_utils.h" | ||
| #include "chrome/test/base/search_test_utils.h" | ||
| #include "components/omnibox/browser/omnibox_edit_model.h" | ||
| #include "components/omnibox/browser/omnibox_view.h" | ||
| #include "components/search_engines/template_url.h" | ||
| #include "components/search_engines/template_url_data_util.h" | ||
| #include "components/search_engines/template_url_service.h" | ||
| #include "content/public/browser/web_contents.h" | ||
| #include "content/public/test/browser_test.h" | ||
| #include "content/public/test/browser_test_utils.h" | ||
| #include "testing/gtest/include/gtest/gtest.h" | ||
| #include "url/gurl.h" | ||
|
|
||
| namespace { | ||
|
|
||
| testing::AssertionResult VerifyTemplateURLServiceLoad( | ||
| TemplateURLService* service) { | ||
| if (service->loaded()) { | ||
| return testing::AssertionSuccess(); | ||
| } | ||
| search_test_utils::WaitForTemplateURLServiceToLoad(service); | ||
| if (service->loaded()) { | ||
| return testing::AssertionSuccess(); | ||
| } | ||
| return testing::AssertionFailure() << "TemplateURLService isn't loaded"; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| class BraveLocationBarViewBrowserTest : public InProcessBrowserTest { | ||
| public: | ||
| BraveLocationBarViewBrowserTest() { | ||
| // Disabled by default. | ||
| EXPECT_FALSE(base::FeatureList::IsEnabled( | ||
| brave_search_conversion::features::kOmniboxPromotionButton)); | ||
|
|
||
| features_.InitAndEnableFeature( | ||
| brave_search_conversion::features::kOmniboxPromotionButton); | ||
| } | ||
|
|
||
| BraveLocationBarView* location_bar() { | ||
| auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); | ||
| return static_cast<BraveLocationBarView*>( | ||
| browser_view->toolbar()->location_bar()); | ||
| } | ||
|
|
||
| OmniboxViewViews* omnibox_view() { return location_bar()->omnibox_view(); } | ||
|
|
||
| views::View* promotion_button_view() { | ||
| return location_bar()->GetSearchPromotionButton(); | ||
| } | ||
|
|
||
| TemplateURLService* GetTemplateURLService() { | ||
| return TemplateURLServiceFactory::GetForProfile(browser()->profile()); | ||
| } | ||
|
|
||
| content::WebContents* web_contents() { | ||
| return browser()->tab_strip_model()->GetActiveWebContents(); | ||
| } | ||
|
|
||
| void WaitUntil(base::RepeatingCallback<bool()> condition) { | ||
| if (condition.Run()) { | ||
| return; | ||
| } | ||
|
|
||
| base::RepeatingTimer scheduler; | ||
| scheduler.Start(FROM_HERE, base::Milliseconds(100), | ||
| base::BindLambdaForTesting([this, &condition]() { | ||
| if (condition.Run()) { | ||
| run_loop_->Quit(); | ||
| } | ||
| })); | ||
| Run(); | ||
| } | ||
|
|
||
| void Run() { | ||
| run_loop_ = std::make_unique<base::RunLoop>(); | ||
| run_loop_->Run(); | ||
| } | ||
|
|
||
| base::test::ScopedFeatureList features_; | ||
| std::unique_ptr<base::RunLoop> run_loop_; | ||
| }; | ||
|
|
||
| IN_PROC_BROWSER_TEST_F(BraveLocationBarViewBrowserTest, | ||
| SearchConversionButtonTest) { | ||
| EXPECT_TRUE(VerifyTemplateURLServiceLoad(GetTemplateURLService())); | ||
|
|
||
| auto bing_search_data = TemplateURLDataFromPrepopulatedEngine( | ||
| TemplateURLPrepopulateData::brave_bing); | ||
| TemplateURL bing_template_url(*bing_search_data); | ||
|
|
||
| auto brave_search_data = TemplateURLDataFromPrepopulatedEngine( | ||
| TemplateURLPrepopulateData::brave_search); | ||
| TemplateURL brave_template_url(*brave_search_data); | ||
|
|
||
| // Set non brave search as a default provider and type any input. | ||
| // Check promotion button is launched. | ||
| GetTemplateURLService()->SetUserSelectedDefaultSearchProvider( | ||
| &bing_template_url); | ||
| location_bar()->FocusLocation(true); | ||
| omnibox_view()->SetUserText(u"a"); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_TRUE(promotion_button_view()->GetVisible()); | ||
|
|
||
| // Unfocus from the omnibox. | ||
| // Omnibox popup is hidden and promotion button will be gone also. | ||
| web_contents()->Focus(); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return !omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_FALSE(promotion_button_view()->GetVisible()); | ||
|
|
||
| // Set brave search as a default provider and type any input. | ||
| GetTemplateURLService()->SetUserSelectedDefaultSearchProvider( | ||
| &brave_template_url); | ||
|
|
||
| // Check button is not shown with brave search. | ||
| location_bar()->FocusLocation(true); | ||
| omnibox_view()->SetUserText(u"a"); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_FALSE(promotion_button_view()->GetVisible()); | ||
|
|
||
| location_bar()->Revert(); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return !omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_FALSE(promotion_button_view()->GetVisible()); | ||
|
|
||
| GetTemplateURLService()->SetUserSelectedDefaultSearchProvider( | ||
| &bing_template_url); | ||
|
|
||
| // Set dismissed and check button is not shown anymore. | ||
| browser()->profile()->GetPrefs()->SetBoolean( | ||
| brave_search_conversion::prefs::kDismissed, true); | ||
| omnibox_view()->SetUserText(u"a"); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_FALSE(promotion_button_view()->GetVisible()); | ||
|
|
||
| location_bar()->Revert(); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return !omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_FALSE(promotion_button_view()->GetVisible()); | ||
|
|
||
| constexpr std::u16string search_term = u"a"; | ||
|
|
||
| // Unset dismissed and simulate promotion button click. | ||
| browser()->profile()->GetPrefs()->SetBoolean( | ||
| brave_search_conversion::prefs::kDismissed, false); | ||
| location_bar()->FocusLocation(true); | ||
| omnibox_view()->SetUserText(search_term); | ||
| WaitUntil(base::BindLambdaForTesting( | ||
| [&]() { return omnibox_view()->model()->PopupIsOpen(); })); | ||
| EXPECT_TRUE(promotion_button_view()->GetVisible()); | ||
|
|
||
| // Check brave search is set as default provider and brave search is loaded in | ||
| // active tab. | ||
| location_bar() | ||
| ->promotion_controller_->SetDefaultAndLoadBraveSearchWithCurrentInput(); | ||
| const TemplateURL* default_provider = | ||
| GetTemplateURLService()->GetDefaultSearchProvider(); | ||
| const auto target_search_url = brave_template_url.GenerateSearchURL( | ||
| GetTemplateURLService()->search_terms_data(), search_term); | ||
| EXPECT_EQ(brave_template_url.prepopulate_id(), | ||
| default_provider->prepopulate_id()); | ||
| content::WaitForLoadStop(web_contents()); | ||
| EXPECT_EQ(target_search_url, web_contents()->GetVisibleURL()); | ||
| } |
Oops, something went wrong.