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); |
} |