[omnibox] Add Pedal to launch incognito window
This CL introduces another experimental action Pedal to launch
an incognito tab in a new browser window.
Bug: 893183
Change-Id: I9b0a671f80037ee646a8bfa6401474d9315e430d
Reviewed-on: https://chromium-review.googlesource.com/c/1274204
Commit-Queue: Orin Jaworski <[email protected]>
Reviewed-by: Justin Donnelly <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#600082}diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc
index 6b9a6cc675..532a766 100644
--- a/chrome/browser/chrome_main_browsertest.cc
+++ b/chrome/browser/chrome_main_browsertest.cc
@@ -88,17 +88,18 @@
}
IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
+ Profile* const profile = browser()->profile();
+
// We should start with one normal window.
- ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile()));
+ ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile));
// Create an incognito window.
- chrome::NewIncognitoWindow(browser());
+ chrome::NewIncognitoWindow(profile);
ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
- ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile()));
+ ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile));
// Close the first window.
- Profile* profile = browser()->profile();
CloseBrowserSynchronously(browser());
// There should only be the incognito window open now.
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc
index 711ea81..58fb1c6 100644
--- a/chrome/browser/signin/chrome_signin_helper.cc
+++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -190,7 +190,7 @@
BrowserWindow::AvatarBubbleMode bubble_mode;
switch (service_type) {
case GAIA_SERVICE_TYPE_INCOGNITO:
- chrome::NewIncognitoWindow(browser);
+ chrome::NewIncognitoWindow(profile);
return;
case GAIA_SERVICE_TYPE_ADDSESSION:
bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT;
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 0649a4c5..6dfff626 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -342,7 +342,7 @@
NewWindow(browser_);
break;
case IDC_NEW_INCOGNITO_WINDOW:
- NewIncognitoWindow(browser_);
+ NewIncognitoWindow(profile());
break;
case IDC_CLOSE_WINDOW:
base::RecordAction(base::UserMetricsAction("CloseWindowByKey"));
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index fe98ecab..10b3d0e 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -577,13 +577,13 @@
NewEmptyWindow(browser->profile()->GetOriginalProfile());
}
-void NewIncognitoWindow(Browser* browser) {
+void NewIncognitoWindow(Profile* profile) {
#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::IncognitoWindowTrackerFactory::GetInstance()
- ->GetForProfile(browser->profile())
+ ->GetForProfile(profile)
->OnIncognitoWindowOpened();
#endif
- NewEmptyWindow(browser->profile()->GetOffTheRecordProfile());
+ NewEmptyWindow(profile->GetOffTheRecordProfile());
}
void CloseWindow(Browser* browser) {
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index 4b31e64..5c6b768 100644
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -70,7 +70,7 @@
void OpenCurrentURL(Browser* browser);
void Stop(Browser* browser);
void NewWindow(Browser* browser);
-void NewIncognitoWindow(Browser* browser);
+void NewIncognitoWindow(Profile* profile);
void CloseWindow(Browser* browser);
void NewTab(Browser* browser);
void CloseTab(Browser* browser);
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
index 9182362..c0c47c5 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -37,6 +37,8 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/translate/chrome_translate_client.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
#include "chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h"
@@ -483,6 +485,10 @@
controller_->GetWebContents()->GetController().DiscardNonCommittedEntries();
}
+void ChromeOmniboxClient::NewIncognitoWindow() {
+ chrome::NewIncognitoWindow(profile_);
+}
+
void ChromeOmniboxClient::PromptPageTranslation() {
content::WebContents* contents = controller_->GetWebContents();
if (contents) {
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
index b791ab6..8372fac 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
@@ -80,6 +80,7 @@
void OnURLOpenedFromOmnibox(OmniboxLog* log) override;
void OnBookmarkLaunched() override;
void DiscardNonCommittedNavigations() override;
+ void NewIncognitoWindow() override;
void PromptPageTranslation() override;
private:
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index a744523..ef3bbc0 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -650,7 +650,7 @@
PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_OPEN_USER_MANAGER);
} else if (sender == go_incognito_button_) {
DCHECK(ShouldShowGoIncognito());
- chrome::NewIncognitoWindow(browser_);
+ chrome::NewIncognitoWindow(browser_->profile());
PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_GO_INCOGNITO);
} else if (sender == lock_button_) {
profiles::LockProfile(browser_->profile());
