diff options
author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 10:55:56 +0000 |
---|---|---|
committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 10:55:56 +0000 |
commit | f77a652641559c41ab46d4039499f080a260e5cc (patch) | |
tree | f4d6fbecfca6e568373e5cf87dd055e47908c2bc /chrome/browser/ui/cocoa/dev_tools_controller.h | |
parent | ee6e81c64f81e9f6b769d08fc83681ad418243e4 (diff) | |
download | chromium_src-f77a652641559c41ab46d4039499f080a260e5cc.zip chromium_src-f77a652641559c41ab46d4039499f080a260e5cc.tar.gz chromium_src-f77a652641559c41ab46d4039499f080a260e5cc.tar.bz2 |
[DevTools] Add toolbox web contents to show in undocked mode.
When docking is possible, but main window is undocked, we show toolbox
web contents. This means that undocked DevTools has two web contents
at the same time: one in a separate window, and one near the inspected tab.
BUG=327641
Review URL: https://codereview.chromium.org/294903014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/dev_tools_controller.h')
-rw-r--r-- | chrome/browser/ui/cocoa/dev_tools_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.h b/chrome/browser/ui/cocoa/dev_tools_controller.h index a97b19a..66fdc62 100644 --- a/chrome/browser/ui/cocoa/dev_tools_controller.h +++ b/chrome/browser/ui/cocoa/dev_tools_controller.h @@ -26,9 +26,9 @@ class WebContents; // A view hosting docked devTools contents. base::scoped_nsobject<DevToolsContainerView> devToolsContainerView_; - // Docked devtools window instance. NULL when current tab is not inspected + // Docked devtools web contents. NULL when current tab is not inspected // or is inspected with undocked version of DevToolsWindow. - DevToolsWindow* devToolsWindow_; + content::WebContents* devTools_; base::scoped_nsobject<FocusTracker> focusTracker_; } |