| 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() {
|
|
|