Plumb HostDesktopType through BrowserListTabContentsProvider.

chrome/browser/devtools/browser_list_tabcontents_provider.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/devtools/browser_list_tabcontents_provider.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_discovery_page_resources.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::DevToolsHttpHandlerDelegate;
 using content::RenderViewHost;
 
 BrowserListTabContentsProvider::BrowserListTabContentsProvider(
-    Profile* profile)
-    : profile_(profile) {
+    Profile* profile,
+    chrome::HostDesktopType host_desktop_type)
+    : profile_(profile), host_desktop_type_(host_desktop_type) {
 }
 
 BrowserListTabContentsProvider::~BrowserListTabContentsProvider() {
 }
 
 std::string BrowserListTabContentsProvider::GetDiscoveryPageHTML() {
   std::set<Profile*> profiles;
   for (chrome::BrowserIterator it; !it.done(); it.Next())
     profiles.insert((*it)->profile());
 
@@ skipping 34 matching lines @@
     scoped_refptr<base::RefCountedMemory> data;
     if (top_sites->GetPageThumbnail(url, &data))
       return std::string(
           reinterpret_cast<const char*>(data->front()), data->size());
   }
 
   return std::string();
 }
 
 RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() {
-  // TODO(gab): Do not hardcode HOST_DESKTOP_TYPE_NATIVE below once
-  // chrome::NewEmptyWindow() above has been made multi-desktop friendly.
   const BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
+      BrowserList::GetInstance(host_desktop_type_);
 
   if (browser_list->empty())
-    chrome::NewEmptyWindowDeprecated(profile_);
+    chrome::NewEmptyWindow(profile_, host_desktop_type_);
 
   if (browser_list->empty())
     return NULL;
 
   content::WebContents* web_contents = chrome::AddSelectedTabWithURL(
       browser_list->get(0),
       GURL(chrome::kAboutBlankURL),
       content::PAGE_TRANSITION_LINK);
   return web_contents->GetRenderViewHost();
 }
 
 content::DevToolsHttpHandlerDelegate::TargetType
 BrowserListTabContentsProvider::GetTargetType(content::RenderViewHost* rvh) {
   for (TabContentsIterator it; !it.done(); it.Next())
     if (rvh == it->GetRenderViewHost())
       return kTargetTypeTab;
 
   return kTargetTypeOther;
 }