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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 294903014: [DevTools] Add toolbox web contents to show in undocked mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fixes Created 6 years, 7 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/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index efb847ce0fbaaffd31067530aa2970a836e95200..fa2067948cd0222345d15554edc596c906807114 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -651,11 +651,10 @@ enum {
if (WebContents* contents =
browser_->tab_strip_model()->GetActiveWebContents()) {
- DevToolsWindow* devtoolsWindow =
- DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
- if (devtoolsWindow) {
- RenderWidgetHostView* devtoolsView =
- devtoolsWindow->web_contents()->GetRenderWidgetHostView();
+ WebContents* devtools = DevToolsWindow::GetWebContentsToShowForInspectedTab(
+ contents, NULL);
+ if (devtools) {
+ RenderWidgetHostView* devtoolsView = devtools->GetRenderWidgetHostView();
if (devtoolsView && devtoolsView->HasFocus()) {
devtoolsView->SetActive(true);
return;
@@ -681,11 +680,10 @@ enum {
if (WebContents* contents =
browser_->tab_strip_model()->GetActiveWebContents()) {
- DevToolsWindow* devtoolsWindow =
- DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
- if (devtoolsWindow) {
- RenderWidgetHostView* devtoolsView =
- devtoolsWindow->web_contents()->GetRenderWidgetHostView();
+ WebContents* devtools = DevToolsWindow::GetWebContentsToShowForInspectedTab(
+ contents, NULL);
+ if (devtools) {
+ RenderWidgetHostView* devtoolsView = devtools->GetRenderWidgetHostView();
if (devtoolsView && devtoolsView->HasFocus()) {
devtoolsView->SetActive(false);
return;

Powered by Google App Engine
This is Rietveld 408576698