Chromium Code Reviews| 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..dbe0d7bd684a8e1af45f8c6c23720cef090e44ea 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::GetInTabWebContents( |
| + contents, NULL); |
|
Avi (use Gerrit)
2014/05/29 15:18:07
Can you fit this on the previous line?
dgozman
2014/05/30 09:59:49
I tried, but no.
|
| + 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::GetInTabWebContents( |
| + contents, NULL); |
| + if (devtools) { |
| + RenderWidgetHostView* devtoolsView = devtools->GetRenderWidgetHostView(); |
| if (devtoolsView && devtoolsView->HasFocus()) { |
| devtoolsView->SetActive(false); |
| return; |