Adjusts panel ifdefs for aura

chrome/browser/ui/panels/panel_manager.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/ui/panels/panel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 106 matching lines @@
       wm_type != ui::WM_ICE_WM &&
       wm_type != ui::WM_KWIN &&
       wm_type != ui::WM_METACITY &&
       wm_type != ui::WM_MUFFIN &&
       wm_type != ui::WM_MUTTER &&
       wm_type != ui::WM_XFWM4) {
     return false;
   }
 #endif  // TOOLKIT_GTK
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)

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

same as in other file, I don't see why we need test for USE_AURA here, unless I
miss something.

   // No panels in Metro mode.
   if (win8::IsSingleWindowMetroMode())
     return false;
 #endif // OS_WIN
 
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
       channel == chrome::VersionInfo::CHANNEL_BETA) {
     return CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnablePanels) ||
@@ skipping 427 matching lines @@
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }
 
 void PanelManager::OnPanelAnimationEnded(Panel* panel) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 }