Remove ScopedHostDesktopType.

It was introduced (in crrev.com/163664) back when desktop context was hard to obtain.
It doesn't seem to be required anymore as all users now have desktop context provided to them.
e.g.:
1) AddBlankTabAt only needs it if it creates a WebContents via CreateTargetWebContents which now takes context from |browser->window()|.
2) ToggleAshDesktop(); I'm not even sure this is used by anyone anymore (appears to only be triggerable from the Wrench menu on Win7- (I tried to force it on Win8 and it doesn't do anything)).

BUG=133312, 129187
TEST=Trigger AddBlankTabAt() from both desktops in parallel, open new windows from the resulting tabs, and verify that everything pops on the expected desktop.


Review URL: https://chromiumcodereview.appspot.com/12381015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185724 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 5 insertions, 63 deletions

diff --git a/chrome/browser/extensions/api/session_restore/session_restore_api.cc b/chrome/browser/extensions/api/session_restore/session_restore_api.cc
index a2d62c3..181457f 100644
--- a/chrome/browser/extensions/api/session_restore/session_restore_api.cc
+++ b/chrome/browser/extensions/api/session_restore/session_restore_api.cc
@@ -168,8 +168,7 @@ bool SessionRestoreRestoreFunction::RunImpl() {
       TabRestoreServiceDelegate::FindDelegateForWebContents(
           browser->tab_strip_model()->GetActiveWebContents());
   DCHECK(delegate);
-  chrome::HostDesktopType host_desktop_type =
-      chrome::GetHostDesktopTypeForBrowser(browser);
+  chrome::HostDesktopType host_desktop_type = browser->host_desktop_type();
   TabRestoreService::Entries entries = tab_restore_service->entries();
 
   if (entries.empty()) {
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index fa1e3ea..f6d6ce2 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -40,7 +40,6 @@ void ToggleAshDesktop() {
   if (chrome::HOST_DESKTOP_TYPE_ASH == chrome::HOST_DESKTOP_TYPE_NATIVE)
     return;
 
-  ScopedForceDesktopType force(chrome::HOST_DESKTOP_TYPE_ASH);
   if (!ash::Shell::HasInstance())
     OpenAsh();
   else
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index c093b83..dd8b4c2 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -293,10 +293,6 @@ void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
 }
 
 Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
-  // TODO(scottmg): http://crbug.com/128578
-  // This is necessary because WebContentsViewAura doesn't have enough context
-  // to get the right StackingClient (and therefore parent window) otherwise.
-  ScopedForceDesktopType force_desktop_type(desktop_type);
   Browser* browser = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
   AddBlankTabAt(browser, -1, true);
diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc
index 8222e62..2d3e83927 100644
--- a/chrome/browser/ui/browser_tabstrip.cc
+++ b/chrome/browser/ui/browser_tabstrip.cc
@@ -19,11 +19,6 @@
 namespace chrome {
 
 void AddBlankTabAt(Browser* browser, int index, bool foreground) {
-  // TODO(scottmg): http://crbug.com/128578
-  // This is necessary because WebContentsViewAura doesn't have enough context
-  // to get the right StackingClient (and therefore parent window) otherwise.
-  ScopedForceDesktopType force_desktop_type(browser->host_desktop_type());
-
   // Time new tab page creation time.  We keep track of the timing data in
   // WebContents, but we want to include the time it takes to create the
   // WebContents object too.
diff --git a/chrome/browser/ui/host_desktop.cc b/chrome/browser/ui/host_desktop.cc
index cefe5e5..f62ad8d 100644
--- a/chrome/browser/ui/host_desktop.cc
+++ b/chrome/browser/ui/host_desktop.cc
@@ -16,28 +16,7 @@
 
 namespace chrome {
 
-namespace {
-
-bool g_force_ = false;
-HostDesktopType g_force_type_ = HOST_DESKTOP_TYPE_COUNT;
-
-}  // namespace
-
-ScopedForceDesktopType::ScopedForceDesktopType(HostDesktopType type)
-    : previous_type_(g_force_type_),
-      previous_force_(g_force_) {
-  g_force_type_ = type;
-  g_force_ = true;
-}
-
-ScopedForceDesktopType::~ScopedForceDesktopType() {
-  g_force_type_ = previous_type_;
-  g_force_ = previous_force_;
-}
-
 HostDesktopType GetHostDesktopTypeForNativeView(gfx::NativeView native_view) {
-  if (g_force_)
-    return g_force_type_;
 #if defined(USE_ASH)
   // TODO(ananta)
   // Once we've threaded creation context to wherever needed, we should remove
@@ -56,8 +35,6 @@ HostDesktopType GetHostDesktopTypeForNativeView(gfx::NativeView native_view) {
 
 HostDesktopType GetHostDesktopTypeForNativeWindow(
     gfx::NativeWindow native_window) {
-  if (g_force_)
-    return g_force_type_;
 #if defined(USE_ASH)
   // TODO(ananta)
   // Once we've threaded creation context to wherever needed, we should remove
@@ -74,12 +51,6 @@ HostDesktopType GetHostDesktopTypeForNativeWindow(
 #endif
 }
 
-HostDesktopType GetHostDesktopTypeForBrowser(const Browser* browser) {
-  if (g_force_)
-    return g_force_type_;
-  return browser->host_desktop_type();
-}
-
 HostDesktopType GetActiveDesktop() {
 #if defined(USE_ASH) && !defined(OS_CHROMEOS)
   // The Ash desktop is considered active if a non-desktop RootWindow was last
diff --git a/chrome/browser/ui/host_desktop.h b/chrome/browser/ui/host_desktop.h
index c22f04a..1349da5 100644
--- a/chrome/browser/ui/host_desktop.h
+++ b/chrome/browser/ui/host_desktop.h
@@ -31,28 +31,10 @@ enum HostDesktopType {
   HOST_DESKTOP_TYPE_COUNT
 };
 
-// Used during initialization to override parenting.
-class ScopedForceDesktopType {
- public:
-  explicit ScopedForceDesktopType(HostDesktopType type);
-  ~ScopedForceDesktopType();
- private:
-  HostDesktopType previous_type_;
-  bool previous_force_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedForceDesktopType);
-};
-
 HostDesktopType GetHostDesktopTypeForNativeView(gfx::NativeView native_view);
 HostDesktopType GetHostDesktopTypeForNativeWindow(
     gfx::NativeWindow native_window);
 
-// Returns the desktop type forced by an active ScopedForceDesktopType or
-// |browser|'s desktop type. Most consumers shouldn't need to care about
-// ScopedForceDesktopType and should use |browser|'s host_desktop_type()
-// directly.
-HostDesktopType GetHostDesktopTypeForBrowser(const Browser* browser);
-
 // Returns the type of host desktop most likely to be in use.  This is the one
 // most recently activated by the user.
 HostDesktopType GetActiveDesktop();
diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.cc b/chrome/browser/ui/views/frame/browser_frame_aura.cc
index b2732d7..799276c 100644
--- a/chrome/browser/ui/views/frame/browser_frame_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_aura.cc
@@ -184,8 +184,8 @@ NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
 #if defined(USE_ASH)
       !chrome::ShouldOpenAshOnStartup() &&
 #endif
-      chrome::GetHostDesktopTypeForBrowser(browser_view->browser()) ==
-          chrome::HOST_DESKTOP_TYPE_NATIVE)
+      browser_view->browser()->
+          host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
     return new DesktopBrowserFrameAura(browser_frame, browser_view);
 #endif
   return new BrowserFrameAura(browser_frame, browser_view);
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
index 9e5b3eb..0d9e8ef 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
@@ -21,8 +21,8 @@ namespace chrome {
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view) {
 #if defined(USE_AURA) && defined(OS_WIN)
-  if (chrome::GetHostDesktopTypeForBrowser(browser_view->browser()) ==
-      chrome::HOST_DESKTOP_TYPE_NATIVE) {
+  if (browser_view->browser()->
+          host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
     if (frame->ShouldUseNativeFrame())
       return new GlassBrowserFrameView(frame, browser_view);
     return new OpaqueBrowserFrameView(frame, browser_view);