Deprecate --aura-panels

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/tabs/tabs.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 536 matching lines @@
     std::string type_str;
     if (args->HasKey(keys::kWindowTypeKey)) {
       EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kWindowTypeKey,
                                                   &type_str));
       if (type_str == keys::kWindowTypeValuePopup) {
         window_type = Browser::TYPE_POPUP;
         extension_id = GetExtension()->id();
       } 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
           window_type = Browser::TYPE_POPUP;
       } else if (type_str != keys::kWindowTypeValueNormal) {
         error_ = keys::kInvalidWindowTypeError;
         return false;
       }
     }
   }
 
   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.
       Panel* panel = PanelManager::GetInstance()->CreatePanel(
           title, window_profile, urls[0], panel_bounds.size());
 
       // Unlike other window types, Panels do not take focus by default.
       if (!saw_focus_key || !focused)
         panel->ShowInactive();
       else
@@ skipping 1225 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }