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 186 matching lines @@
 // those of the browser.
 bool MatchesBool(bool* boolean, bool value) {
   return !boolean || *boolean == value;
 }
 
 Browser* CreateBrowserWindow(const Browser::CreateParams& params,
                              Profile* profile,
                              const std::string& extension_id) {
   bool use_existing_browser_window = false;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)

[Dmitry Titov, 2013/11/05 05:53:07]

IsSingleWindowMetroMode() returns false if USE_ASH. I think it was needed for
old mode when we had a single browser window (no Ash) in Metro. If so, is this
USE_AURA check needed?

[sky, 2013/11/05 15:49:37]

You are right. I was trying to make it clear this isn't needed for aura. But
I'll remove the USE_AURA.

   // In windows 8 metro mode we don't allow windows to be created.
   if (win8::IsSingleWindowMetroMode())
     use_existing_browser_window = true;
 #endif  // OS_WIN
 
   Browser* new_window = NULL;
   if (use_existing_browser_window)
     // The false parameter passed below is to ensure that we find a browser
     // object matching the profile passed in, instead of the original profile
     new_window = chrome::FindTabbedBrowser(profile, false,
@@ skipping 239 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 defined(USE_ASH)
+    if (PanelManager::ShouldUsePanels(extension_id) &&
+        chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {

[Dmitry Titov, 2013/11/05 05:53:07]

There should be an else branch that creates a panel via PanelManager - in case
when GetActiveDesktop() == HOST_DESKTOP_TYPE_NATIVE. Now this code is under
"#else" below, so it won't get compiled in. 

I think we still want to create native panels when browser runs on Desktop.

[sky, 2013/11/05 15:49:37]

I think you're saying nuke the ifdef here. Done. GetActiveDesktop() is safe to
call on non-aura/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()->
@@ skipping 94 matching lines @@
 bool WindowsUpdateFunction::RunImpl() {
   scoped_ptr<windows::Update::Params> params(
       windows::Update::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   WindowController* controller;
   if (!windows_util::GetWindowFromWindowID(this, params->window_id,
                                             &controller))
     return false;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Silently ignore changes on the window for metro mode.
   if (win8::IsSingleWindowMetroMode()) {
     SetResult(controller->CreateWindowValue());
     return true;
   }
 #endif
 
   ui::WindowShowState show_state = ui::SHOW_STATE_DEFAULT;  // No change.
   switch (params->update_info.state) {
     case windows::Update::Params::UpdateInfo::STATE_NORMAL:
@@ skipping 107 matching lines @@
 bool WindowsRemoveFunction::RunImpl() {
   scoped_ptr<windows::Remove::Params> params(
       windows::Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   WindowController* controller;
   if (!windows_util::GetWindowFromWindowID(this, params->window_id,
                                            &controller))
     return false;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // In Windows 8 metro mode, an existing Browser instance is reused for
   // hosting the extension tab. We should not be closing it as we don't own it.
   if (win8::IsSingleWindowMetroMode())
     return false;
 #endif
 
   WindowController::Reason reason;
   if (!controller->CanClose(&reason)) {
     if (reason == WindowController::REASON_NOT_EDITABLE)
       error_ = keys::kTabStripNotEditableError;
@@ skipping 1276 matching lines @@
   execute_tab_id_ = tab_id;
   details_ = details.Pass();
   return true;
 }
 
 bool TabsInsertCSSFunction::ShouldInsertCSS() const {
   return true;
 }
 
 }  // namespace extensions