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

Unified Diff: chrome/browser/ui/browser.cc

Issue 10689071: Deprecate --aura-panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix WindowOpenPanelTest.CloseNonExtensionPanelsOnUninstall Created 8 years, 6 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/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index d4f7c015d5dbdcc1cd42f6e08fe9946c8132887e..7f56a1577e5aae75f08ed2152df2fe3672665645 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1451,17 +1451,10 @@ void Browser::ShowFirstRunBubble() {
// Browser, protected:
BrowserWindow* Browser::CreateBrowserWindow() {
- bool create_panel = false;
-#if defined(USE_ASH)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAuraPanelManager))
- create_panel = is_type_panel();
-#elif !defined(OS_CHROMEOS)
- create_panel = is_type_panel();
-#endif
- if (create_panel)
+#if !defined(USE_ASH)
+ if (is_type_panel())
return PanelManager::GetInstance()->CreatePanel(this)->browser_window();
-
+#endif
return BrowserWindow::CreateBrowserWindow(this);
}

Powered by Google App Engine
This is Rietveld 408576698