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

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 e1521298c4cfb86f24a857f8a4d5564d750473f2..5a1cff98afeb338a8107ac45a50b1f5185a3d797 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;
}
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/extensions/api/management/management_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698