Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3774)

Unified Diff: chrome/browser/devtools/browser_list_tabcontents_provider.cc

Issue 12210063: Make devtools_window.cc multi-desktop aware. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: NOTREACHED if both browser_ and inspected_web_contents_ are NULL. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/browser_list_tabcontents_provider.cc
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index 4e461ce624ea03f37bd3fa32e0d4f9d3a470e998..ced0e5c62f2d0832fc1c897166abbe8a18aaf039 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -12,7 +12,9 @@
#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"
@@ -87,8 +89,12 @@ RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() {
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),
GURL(chrome::kAboutBlankURL),
content::PAGE_TRANSITION_LINK);
return web_contents->GetRenderViewHost();
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.h » ('j') | chrome/browser/devtools/devtools_window.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698