Deprecate --aura-panels

chrome/browser/extensions/api/tabs/tabs.cc

Index: chrome/browser/extensions/api/tabs/tabs.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index 3d80a52e7ef640dd813a48194a717a80f717f276..d3e8f44913209f387f3602acc0e07ed63f2bd46d 100644
--- a/chrome/browser/extensions/api/tabs/tabs.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.cc
@@ -554,14 +554,9 @@ bool CreateWindowFunction::RunImpl() {
       } else if (type_str == keys::kWindowTypeValuePanel) {
         extension_id = GetExtension()->id();
         bool use_panels = false;
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(USE_ASH)
         use_panels = PanelManager::ShouldUsePanels(extension_id);
 #endif
-#if defined(USE_ASH)
-        if (CommandLine::ForCurrentProcess()->HasSwitch(
-                ash::switches::kAuraPanelManager))
-          use_panels = true;
-#endif
         if (use_panels)
           window_type = Browser::TYPE_PANEL;
         else
@@ -576,18 +571,7 @@ bool CreateWindowFunction::RunImpl() {
   if (window_type == Browser::TYPE_PANEL) {
     std::string title =
         web_app::GenerateApplicationNameFromExtensionId(extension_id);
-#if defined(USE_ASH)
-  // Aura Panels create a new PanelViewAura.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-            ash::switches::kAuraPanelManager)) {
-    // Note: Panels ignore all but the first url provided.
-    PanelViewAura* panel_view = new PanelViewAura(title);
-    panel_view->Init(window_profile, urls[0], panel_bounds);
-      result_.reset(panel_view->extension_window_controller()->
-                    CreateWindowValueWithTabs());
-      return true;
-    }
-#else
+#if !defined(USE_ASH)
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kBrowserlessPanels)) {
       // Note: Panels ignore all but the first url provided.