Make devtools_window.cc multi-desktop aware.

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_list_impl.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;
@@ skipping 54 matching lines @@
   return std::string();
 }
 
 RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() {
   if (BrowserList::empty())
     chrome::NewEmptyWindow(profile_);
 
   if (BrowserList::empty())
     return NULL;
 
+  // TODO(gab): Do not hardcode HOST_DESKTOP_TYPE_NATIVE below once
+  // chrome::NewEmptyWindow() above has been made multi-desktop friendly.
+  const chrome::BrowserListImpl* browser_list =
+      chrome::BrowserListImpl::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
   content::WebContents* web_contents = chrome::AddSelectedTabWithURL(
-      *BrowserList::begin(),
+      browser_list->get(0),

[pfeldman, 2013/02/07 20:12:49]

Will it tolerate 0 in case of empty list?

[gab, 2013/02/07 20:31:45]

This is no different than the previous code which was dereferencing
BrowserList::begin().

       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;
 }