Make all consumers of chrome::NewEmptyWindow and chrome::OpenEmptyWindow browser commands use the version specifying a HostDesktopType.
Removes chrome::OpenEmptyWindow() completely. 1 trickier consumer remains for chrome::NewEmptyWindow(), but the non-multi-desktop aware ovveride of this call was renamed to chrome::NewEmptyWindowDeprecated() and will be removed in a follow-up CL.
- Re-used desktop context where it was present.
- Hardcoded context to HOST_DESKTOP_TYPE_ASH for everything under chrome/browser/ui/ash/.
- Hardcoded context to HOST_DESKTOP_TYPE_NATIVE in tests.
BUG=129187
Review URL: https://chromiumcodereview.appspot.com/12282048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183424 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 94f48822..93d0d41 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -119,7 +119,7 @@
Browser* CreateBrowser(Profile* profile) {
{
base::AutoReset<bool> auto_reset_in_run(&g_is_opening_new_window, true);
- chrome::NewEmptyWindow(profile);
+ chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
}
Browser* browser = chrome::GetLastActiveBrowser();
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 4ce3ccd1..dd6ca23 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -96,9 +96,11 @@
}
Browser* BackgroundModeManager::BackgroundModeData::GetBrowserWindow() {
+ chrome::HostDesktopType host_desktop_type = chrome::GetActiveDesktop();
Browser* browser = chrome::FindLastActiveWithProfile(profile_,
- chrome::GetActiveDesktop());
- return browser ? browser : chrome::OpenEmptyWindow(profile_);
+ host_desktop_type);
+ return browser ? browser : chrome::OpenEmptyWindow(profile_,
+ host_desktop_type);
}
int BackgroundModeManager::BackgroundModeData::GetBackgroundAppCount() const {
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index b06b0d8..0c75c39 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -89,7 +89,7 @@
chrome::BrowserListImpl::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
if (browser_list->empty())
- chrome::NewEmptyWindow(profile_);
+ chrome::NewEmptyWindowDeprecated(profile_);
if (browser_list->empty())
return NULL;
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index acad0c6..d5cb8c8 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/url_constants.h"
@@ -748,7 +749,8 @@
InstantTestModelObserver observer(instant()->model(),
chrome::search::Mode::MODE_DEFAULT);
- chrome::NewEmptyWindow(browser()->profile());
+ chrome::NewEmptyWindow(browser()->profile(),
+ chrome::HOST_DESKTOP_TYPE_NATIVE);
observer.WaitUntilDesiredPreviewState();
// Even though we just created a new Browser object (for the new window), the
diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
index 8c6aa0d..bf9353b 100644
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
+++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
@@ -98,7 +98,7 @@
Browser* browser = browser_list->get(0);
DCHECK(browser == chrome::FindBrowserWithWebContents(web_contents));
if (browser->tab_strip_model()->count() == 1)
- chrome::NewEmptyWindow(browser->profile());
+ chrome::NewEmptyWindow(browser->profile(), browser->host_desktop_type());
}
web_contents->GetDelegate()->CloseContents(web_contents);
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index 65943e9..105af282 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_notification_types.h"
@@ -369,7 +370,7 @@
ui_test_utils::BrowserAddedObserver window_observer;
content::TestNavigationObserver navigation_observer(
content::NotificationService::AllSources(), NULL, expected_tab_count);
- chrome::NewEmptyWindow(profile);
+ chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
Browser* new_browser = window_observer.WaitForSingleNewBrowser();
navigation_observer.Wait();
g_browser_process->ReleaseModule();
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index db1b87a..f934e99 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/ui/browser_list_impl.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -122,7 +123,7 @@
ui_test_utils::BrowserAddedObserver window_observer;
content::TestNavigationObserver navigation_observer(
content::NotificationService::AllSources(), NULL, expected_tab_count);
- chrome::NewEmptyWindow(profile);
+ chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
Browser* new_browser = window_observer.WaitForSingleNewBrowser();
navigation_observer.Wait();
g_browser_process->ReleaseModule();
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 9f7c6f03..89bea69f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/extensions/shell_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -546,7 +547,7 @@
content::WindowedNotificationObserver open_observer(
chrome::NOTIFICATION_BROWSER_WINDOW_READY,
content::NotificationService::AllSources());
- chrome::NewEmptyWindow(browser()->profile());
+ chrome::NewEmptyWindow(browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
open_observer.Wait();
Browser* browser2 = content::Source<Browser>(open_observer.source()).ptr();
aura::Window* window2 = browser2->window()->GetNativeWindow();
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
index 6a87f6a..f8de36a 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
@@ -658,7 +658,8 @@
}
void ChromeLauncherControllerPerApp::CreateNewIncognitoWindow() {
- chrome::NewEmptyWindow(GetProfileForNewWindows()->GetOffTheRecordProfile());
+ chrome::NewEmptyWindow(GetProfileForNewWindows()->GetOffTheRecordProfile(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
}
bool ChromeLauncherControllerPerApp::CanPin() const {
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc
index f4eba24b..9c2620f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/extensions/shell_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -549,7 +550,7 @@
content::WindowedNotificationObserver open_observer(
chrome::NOTIFICATION_BROWSER_WINDOW_READY,
content::NotificationService::AllSources());
- chrome::NewEmptyWindow(browser()->profile());
+ chrome::NewEmptyWindow(browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
open_observer.Wait();
Browser* browser2 = content::Source<Browser>(open_observer.source()).ptr();
aura::Window* window2 = browser2->window()->GetNativeWindow();
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
index 2d911eb..b21698b5 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
@@ -36,6 +36,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/extensions/extension_enable_flow.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_notification_types.h"
@@ -684,7 +685,8 @@
}
void ChromeLauncherControllerPerBrowser::CreateNewIncognitoWindow() {
- chrome::NewEmptyWindow(GetProfileForNewWindows()->GetOffTheRecordProfile());
+ chrome::NewEmptyWindow(GetProfileForNewWindows()->GetOffTheRecordProfile(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
}
bool ChromeLauncherControllerPerBrowser::CanPin() const {
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 212a54a..56e4de2 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -38,6 +38,7 @@
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
#include "chrome/browser/ui/tabs/pinned_tab_codec.h"
@@ -487,7 +488,8 @@
// Open a second browser window at about:blank.
ui_test_utils::BrowserAddedObserver browser_added_observer;
- chrome::NewEmptyWindow(browser()->profile());
+ chrome::NewEmptyWindow(browser()->profile(),
+ chrome::HOST_DESKTOP_TYPE_NATIVE);
Browser* second_window = browser_added_observer.WaitForSingleNewBrowser();
ui_test_utils::NavigateToURL(second_window, GURL("about:blank"));
@@ -1722,7 +1724,7 @@
EXPECT_EQ(0u, chrome::GetTotalBrowserCount());
ui_test_utils::BrowserAddedObserver browser_added_observer;
- chrome::NewEmptyWindow(profile);
+ chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
browser_added_observer.WaitForSingleNewBrowser();
EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 3c5dac2..884e0cf 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -292,7 +292,9 @@
}
}
-void NewEmptyWindow(Profile* profile) {
+// TODO(gab): This method is deprecated and will be removed shortly. Please use
+// the new version of the NewEmptyWindow call.
+void NewEmptyWindowDeprecated(Profile* profile) {
NewEmptyWindow(profile, HOST_DESKTOP_TYPE_NATIVE);
}
@@ -308,10 +310,6 @@
return browser;
}
-Browser* OpenEmptyWindow(Profile* profile) {
- return OpenEmptyWindow(profile, HOST_DESKTOP_TYPE_NATIVE);
-}
-
void OpenWindowWithRestoredTabs(Profile* profile,
HostDesktopType host_desktop_type) {
TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);
@@ -449,11 +447,13 @@
#if !defined(OS_WIN)
void NewWindow(Browser* browser) {
- NewEmptyWindow(browser->profile()->GetOriginalProfile());
+ NewEmptyWindow(browser->profile()->GetOriginalProfile(),
+ browser->host_desktop_type());
}
void NewIncognitoWindow(Browser* browser) {
- NewEmptyWindow(browser->profile()->GetOffTheRecordProfile());
+ NewEmptyWindow(browser->profile()->GetOffTheRecordProfile(),
+ browser->host_desktop_type());
}
#endif // OS_WIN
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index 3153e64..b5b56c5a 100644
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -40,12 +40,11 @@
int GetContentRestrictions(const Browser* browser);
// Opens a new window with the default blank tab.
-void NewEmptyWindow(Profile* profile);
+void NewEmptyWindowDeprecated(Profile* profile);
void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type);
// Opens a new window with the default blank tab. This bypasses metrics and
// various internal bookkeeping; NewEmptyWindow (above) is preferred.
-Browser* OpenEmptyWindow(Profile* profile);
Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type);
// Opens a new window with the tabs from |profile|'s TabRestoreService.
diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc
index 5c477f9..db2316f 100644
--- a/chrome/browser/ui/browser_win.cc
+++ b/chrome/browser/ui/browser_win.cc
@@ -30,7 +30,7 @@
host_desktop_type);
if (!browser) {
- chrome::OpenEmptyWindow(profile);
+ chrome::OpenEmptyWindow(profile, host_desktop_type);
return;
}
