Adjusts panel ifdefs for aura

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 446 matching lines @@
         break;
       case windows::Create::Params::CreateData::TYPE_PANEL:
       case windows::Create::Params::CreateData::TYPE_DETACHED_PANEL: {
         extension_id = GetExtension()->id();
         bool use_panels = false;
 #if !defined(OS_ANDROID)
         use_panels = PanelManager::ShouldUsePanels(extension_id);
 #endif
         if (use_panels) {
           create_panel = true;
-#if !defined(OS_CHROMEOS)
-          // Non-ChromeOS has both docked and detached panel types.
-          if (create_data->type ==
+          // Non-ash supports both docked and detached panel types.
+          if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH &&
+              create_data->type ==
               windows::Create::Params::CreateData::TYPE_DETACHED_PANEL) {
             panel_create_mode = PanelManager::CREATE_AS_DETACHED;
           }
-#endif
         } else {
           window_type = Browser::TYPE_POPUP;
         }
         break;
       }
       case windows::Create::Params::CreateData::TYPE_NONE:
       case windows::Create::Params::CreateData::TYPE_NORMAL:
         break;
       default:
         error_ = keys::kInvalidWindowTypeError;
@@ skipping 40 matching lines @@
     if (create_data->focused) {
       focused = *create_data->focused;
       saw_focus_key = true;
     }
   }
 
   if (create_panel) {
     if (urls.empty())
       urls.push_back(GURL(chrome::kChromeUINewTabURL));
 
-#if defined(OS_CHROMEOS)
-    if (PanelManager::ShouldUsePanels(extension_id)) {
+    if (PanelManager::ShouldUsePanels(extension_id) &&

[Dmitry Titov, 2013/11/05 17:47:19]

This check for ShouldUsePanels can be removed since create_panel variable
checked above already means the same thing, it does this check earlier.

[sky, 2013/11/05 18:07:54]

Done.

+        chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
       ShellWindow::CreateParams create_params;
       create_params.window_type = ShellWindow::WINDOW_TYPE_V1_PANEL;
       create_params.bounds = window_bounds;
       create_params.focused = saw_focus_key && focused;
       ShellWindow* shell_window = new ShellWindow(
           window_profile, new ChromeShellWindowDelegate(),
           GetExtension());
       AshPanelContents* ash_panel_contents = new AshPanelContents(shell_window);
       shell_window->Init(urls[0], ash_panel_contents, create_params);
       SetResult(ash_panel_contents->GetExtensionWindowController()->
                 CreateWindowValueWithTabs(GetExtension()));
       return true;
     }
-#else
     std::string title =
         web_app::GenerateApplicationNameFromExtensionId(extension_id);
     // Note: Panels ignore all but the first url provided.
     Panel* panel = PanelManager::GetInstance()->CreatePanel(
         title, window_profile, urls[0], window_bounds, panel_create_mode);
 
     // Unlike other window types, Panels do not take focus by default.
     if (!saw_focus_key || !focused)
       panel->ShowInactive();
     else
       panel->Show();
 
     SetResult(
         panel->extension_window_controller()->CreateWindowValueWithTabs(
             GetExtension()));
     return true;
-#endif
   }
 
   // Create a new BrowserWindow.
   chrome::HostDesktopType host_desktop_type = chrome::GetActiveDesktop();
   if (create_panel)
     window_type = Browser::TYPE_POPUP;
   Browser::CreateParams create_params(window_type, window_profile,
                                       host_desktop_type);
   if (extension_id.empty()) {
     create_params.initial_bounds = window_bounds;
@@ skipping 1488 matching lines @@
   execute_tab_id_ = tab_id;
   details_ = details.Pass();
   return true;
 }
 
 bool TabsInsertCSSFunction::ShouldInsertCSS() const {
   return true;
 }
 
 }  // namespace extensions