summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_commands.cc
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-20 06:03:41 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-20 06:03:41 +0000
commita8e3c53536eb6f8f0e61589d50a11a9538b05d08 (patch)
treec4850f2830b9a584f3646b94eab2f23bab821003 /chrome/browser/ui/browser_commands.cc
parent2c4b6df8563ff0e84f83de3ee6e6aef925c2ad69 (diff)
downloadchromium_src-a8e3c53536eb6f8f0e61589d50a11a9538b05d08.zip
chromium_src-a8e3c53536eb6f8f0e61589d50a11a9538b05d08.tar.gz
chromium_src-a8e3c53536eb6f8f0e61589d50a11a9538b05d08.tar.bz2
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
Diffstat (limited to 'chrome/browser/ui/browser_commands.cc')
-rw-r--r--chrome/browser/ui/browser_commands.cc14
1 files changed, 7 insertions, 7 deletions
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, HostDesktopType desktop_type) {
}
}
-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 @@ Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
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 @@ void Stop(Browser* browser) {
#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