diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 12:43:13 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 12:43:13 +0000 |
| commit | 91de58ee5e168df8a33291ed1d66803c4927de01 (patch) | |
| tree | e3f792b2a1ca0cf27b126dc9e2cd23c44b15af73 /chrome/browser/ui/views/frame/browser_view.h | |
| parent | 8282b5cab31bec44f3f2c16a980e4c61a6623a45 (diff) | |
| download | chromium_src-91de58ee5e168df8a33291ed1d66803c4927de01.zip chromium_src-91de58ee5e168df8a33291ed1d66803c4927de01.tar.gz chromium_src-91de58ee5e168df8a33291ed1d66803c4927de01.tar.bz2 | |
DevTools: merge is_docked and dock_side into single dock_side state.
As of today, we manage devtools window state in a weird way: it can be either docked or undocked, and while docked it can attach to bottom or to the right. These two levels of setting makes it hard to manage code, we'd like devtools window to have enum of equal states: bottom, right, undocked (so far). This change makes it happen.
Review URL: https://chromiumcodereview.appspot.com/11189060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/frame/browser_view.h')
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_view.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index a5a26cd..9a7073a 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "build/build_config.h" +#include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/infobars/infobar_container.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" @@ -258,7 +259,6 @@ class BrowserView : public BrowserWindow, virtual void BookmarkBarStateChanged( BookmarkBar::AnimateChangeType change_type) OVERRIDE; virtual void UpdateDevTools() OVERRIDE; - virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE; virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; virtual void SetStarredState(bool is_starred) OVERRIDE; virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE; @@ -508,11 +508,14 @@ class BrowserView : public BrowserWindow, bool MaybeShowInfoBar(TabContents* contents); // Shows docked devtools. - void ShowDevToolsContainer(); + void ShowDevToolsContainer(DevToolsDockSide side); // Hides docked devtools. void HideDevToolsContainer(); + // Updates devtools dock side. + void SetDevToolsDockSide(DevToolsDockSide side); + // Updated devtools window for given contents. void UpdateDevToolsForContents(TabContents* tab_contents); |