reland of https://codereview.chromium.org/11364053/ w/o removing the per-rootwindow stacking client

chrome/browser/ui/browser_tabstrip.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_tabstrip.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 38 matching lines @@
 content::WebContents* GetWebContentsAt(const Browser* browser, int index) {
   TabContents* tab = GetTabContentsAt(browser, index);
   return tab ? tab->web_contents() : NULL;
 }
 
 void ActivateTabAt(Browser* browser, int index, bool user_gesture) {
   browser->tab_strip_model()->ActivateTabAt(index, user_gesture);
 }
 
 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.
   base::TimeTicks new_tab_start_time = base::TimeTicks::Now();
   chrome::NavigateParams params(browser, GURL(chrome::kChromeUINewTabURL),
                                 content::PAGE_TRANSITION_TYPED);
   params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   params.tabstrip_index = index;
   chrome::Navigate(&params);
   params.target_contents->web_contents()->SetNewTabStartTime(
@@ skipping 118 matching lines @@
   return BrowserTabstripTabContentsCreator::CreateTabContents(
       content::WebContents::CreateWithSessionStorage(
           profile,
           site_instance,
           routing_id,
           base_web_contents,
           session_storage_namespace_map));
 }
 
 }  // namespace chrome