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

Unified Diff: ash/shell.cc

Issue 10689071: Deprecate --aura-panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/wm/panel_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 236a1ec91d3f0fb6dbbbb4883d21877c0f7f2b52..ec4fd58114ab511a5d15889f02c2c739eac4e671 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -762,18 +762,15 @@ void Shell::InitLayoutManagersForPrimaryDisplay(
set_shelf(shelf());
// Create Panel layout manager
- if (CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kAuraPanelManager)) {
- aura::Window* panel_container = GetContainer(
- GetPrimaryRootWindow(),
- internal::kShellWindowId_PanelContainer);
- panel_layout_manager_ =
- new internal::PanelLayoutManager(panel_container);
- panel_container->SetEventFilter(
- new internal::PanelWindowEventFilter(
- panel_container, panel_layout_manager_));
- panel_container->SetLayoutManager(panel_layout_manager_);
- }
+ aura::Window* panel_container = GetContainer(
+ GetPrimaryRootWindow(),
+ internal::kShellWindowId_PanelContainer);
+ panel_layout_manager_ =
+ new internal::PanelLayoutManager(panel_container);
+ panel_container->SetEventFilter(
+ new internal::PanelWindowEventFilter(
+ panel_container, panel_layout_manager_));
+ panel_container->SetLayoutManager(panel_layout_manager_);
}
void Shell::DisableWorkspaceGridLayout() {
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/wm/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698