diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 09:33:32 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 09:33:32 +0000 |
| commit | 7efaed367a5144c072a95f340cf13b510a3f1979 (patch) | |
| tree | 8a805932f85b979f50307e4b8ef7b5136601ecf2 /chrome/browser/devtools | |
| parent | 5a62b8be1dae0bb706104ccffc57466a8d411923 (diff) | |
| download | chromium_src-7efaed367a5144c072a95f340cf13b510a3f1979.zip chromium_src-7efaed367a5144c072a95f340cf13b510a3f1979.tar.gz chromium_src-7efaed367a5144c072a95f340cf13b510a3f1979.tar.bz2 | |
Deprecate Browser::TYPE_PANEL
BUG=225595
Review URL: https://chromiumcodereview.appspot.com/13139004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
| -rw-r--r-- | chrome/browser/devtools/devtools_window.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/devtools/devtools_window.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index e152129..5a1cff9 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -351,7 +351,7 @@ void DevToolsWindow::Show(DevToolsToggleAction action) { Browser* inspected_browser; int inspected_tab_index; // Tell inspected browser to update splitter and switch to inspected panel. - if (!IsInspectedBrowserPopupOrPanel() && + if (!IsInspectedBrowserPopup() && FindInspectedBrowserAndTabIndex(&inspected_browser, &inspected_tab_index)) { BrowserWindow* inspected_window = inspected_browser->window(); @@ -503,13 +503,13 @@ BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() { browser->window() : NULL; } -bool DevToolsWindow::IsInspectedBrowserPopupOrPanel() { +bool DevToolsWindow::IsInspectedBrowserPopup() { Browser* browser = NULL; int tab; if (!FindInspectedBrowserAndTabIndex(&browser, &tab)) return false; - return browser->is_type_popup() || browser->is_type_panel(); + return browser->is_type_popup(); } void DevToolsWindow::UpdateFrontendDockSide() { @@ -851,7 +851,7 @@ void DevToolsWindow::SetDockSide(const std::string& side) { content::WebContents* inspected_web_contents = GetInspectedWebContents(); if (dock_requested && (!inspected_web_contents || - !GetInspectedBrowserWindow() || IsInspectedBrowserPopupOrPanel())) { + !GetInspectedBrowserWindow() || IsInspectedBrowserPopup())) { // Cannot dock, avoid window flashing due to close-reopen cycle. return; } diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h index 29e93d9..76f4e7d 100644 --- a/chrome/browser/devtools/devtools_window.h +++ b/chrome/browser/devtools/devtools_window.h @@ -136,7 +136,7 @@ class DevToolsWindow : private content::NotificationObserver, void CreateDevToolsBrowser(); bool FindInspectedBrowserAndTabIndex(Browser**, int* tab); BrowserWindow* GetInspectedBrowserWindow(); - bool IsInspectedBrowserPopupOrPanel(); + bool IsInspectedBrowserPopup(); void UpdateFrontendDockSide(); void Hide(); |