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

Unified Diff: chrome/browser/devtools/devtools_window.cc

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 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/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 63620b0d564066fa65451cb5310e970ad8a82f9c..4d02ef0c8791f9b6e76e6404a73ecafb3e888d37 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -317,7 +317,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();
@@ -469,13 +469,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() {
@@ -812,7 +812,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;
}

Powered by Google App Engine
This is Rietveld 408576698