Revert 185358

chrome/browser/extensions/api/tabs/tabs_api.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_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 581 matching lines @@
                                                    &focused));
       saw_focus_key = true;
     }
   }
 
   if (window_type == Browser::TYPE_PANEL) {
     if (urls.empty())
       urls.push_back(GURL(chrome::kChromeUINewTabURL));
 
 #if defined(OS_CHROMEOS)
-    if (PanelManager::ShouldUsePanels(extension_id)) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels) &&
+        PanelManager::ShouldUsePanels(extension_id)) {
       ShellWindow::CreateParams create_params;
       create_params.window_type = ShellWindow::WINDOW_TYPE_V1_PANEL;
       create_params.bounds = window_bounds;
       create_params.minimum_size = window_bounds.size();
       create_params.maximum_size = window_bounds.size();
       ShellWindow* shell_window =
           new ShellWindow(window_profile, GetExtension());
       AshPanelContents* ash_panel_contents = new AshPanelContents(shell_window);
       shell_window->Init(urls[0], ash_panel_contents, create_params);
       SetResult(ash_panel_contents->GetExtensionWindowController()->
@@ skipping 1541 matching lines @@
           extension->id(),
           script_type,
           code_string,
           frame_scope,
           run_at,
           ScriptExecutor::ISOLATED_WORLD,
           false /* is_web_view */,
           base::Bind(&ExecuteCodeInTabFunction::OnExecuteCodeFinished, this));
   return true;
 }