Deprecate --aura-panels

Ash panels will be triggered only by the experimental appWindow.create apps v2 API, and no longer require a separate flag.
Support for Ash panels with apps v1 is deprecated.

BUG=none
TEST=unit/browser tests should pass, test panels should work in ash shell without flag.

Resubmitting - this was reverted because VM tests failed, but I have been unable to reproduce the failure.

Original CL: https://chromiumcodereview.appspot.com/10689071
TBR=ben@chromium.org,jennb@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10695153

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146353 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 9 insertions, 17 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index c3bf2c7..ca6a753 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -44,8 +44,5 @@ const char kAuraLegacyPowerButton[] = "aura-legacy-power-button";
 // Avoid drawing drop shadows under windows.
 const char kAuraNoShadows[] = "aura-no-shadows";
 
-// Use Aura to manage windows of type WINDOW_TYPE_PANEL.
-const char kAuraPanelManager[] = "aura-panels";
-
 }  // namespace switches
 }  // namespace ash
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index dfcf74c..a2df225 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -26,7 +26,6 @@ ASH_EXPORT extern const char kAshWindowAnimationsDisabled[];
 ASH_EXPORT extern const char kAuraGoogleDialogFrames[];
 ASH_EXPORT extern const char kAuraLegacyPowerButton[];
 ASH_EXPORT extern const char kAuraNoShadows[];
-ASH_EXPORT extern const char kAuraPanelManager[];
 
 }  // namespace switches
 }  // namespace ash
diff --git a/ash/shell.cc b/ash/shell.cc
index 5c7b9754..06f39ed 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -733,18 +733,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() {
diff --git a/ash/wm/panel_layout_manager_unittest.cc b/ash/wm/panel_layout_manager_unittest.cc
index 947a892..3a4fd37 100644
--- a/ash/wm/panel_layout_manager_unittest.cc
+++ b/ash/wm/panel_layout_manager_unittest.cc
@@ -30,7 +30,6 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
   virtual ~PanelLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
-    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kAuraPanelManager);
     ash::test::AshTestBase::SetUp();
     ASSERT_TRUE(ash::test::TestLauncherDelegate::instance());