Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/views/bubble/bubble.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
 #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
 #pragma once
 
 #include "views/bubble/bubble_border.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "views/accelerator.h"
 #include "views/view.h"
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+#include "views/widget/native_widget_aura.h"
+#elif defined(OS_WIN)
 #include "views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "views/widget/native_widget_gtk.h"
 #endif
 
 // Bubble is used to display an arbitrary view above all other windows.
 // Think of Bubble as a tooltip that allows you to embed an arbitrary view
 // in the tooltip. Additionally the Bubble renders an arrow pointing at
 // the region the info bubble is providing the information about.
 //
 // To use an Bubble, invoke Show() and it'll take care of the rest.  The Bubble
 // insets the contents for you, so the contents typically shouldn't have any
 // additional margins.
 
 class BorderContents;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 class BorderWidgetWin;
 #endif
 class Bubble;
 
 namespace gfx {
 class Path;
 }
 
 namespace ui {
 class SlideAnimation;
@@ skipping 22 matching lines @@
   virtual bool FadeInOnShow() = 0;
 
   // The name of the window to which this delegate belongs.
   virtual std::wstring accessible_name();
 };
 
 // TODO(sky): this code is ifdef-tastic. It might be cleaner to refactor the
 // WidgetFoo subclass into a separate class that calls into Bubble.
 // That way Bubble has no (or very few) ifdefs.
 class Bubble
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+    : public views::NativeWidgetAura,
+#elif defined(OS_WIN)
     : public views::NativeWidgetWin,
 #elif defined(TOOLKIT_USES_GTK)
     : public views::NativeWidgetGtk,
 #endif
       public views::AcceleratorTarget,
       public ui::AnimationDelegate {
  public:
   // Shows the Bubble.
   // |parent| is set as the parent window.
   // |contents| are the contents shown in the bubble.
@@ skipping 34 matching lines @@
   void SizeToContents();
 
   // Whether the Bubble should fade away when it closes. Generally speaking,
   // we use FadeOut when the user selects something within the bubble that
   // causes the bubble to dismiss. We don't use it when the bubble gets
   // deactivated as a result of clicking outside the bubble.
   void set_fade_away_on_close(bool fade_away_on_close) {
     fade_away_on_close_ = fade_away_on_close;
   }
 
-  // Overridden from NativeWidgetWin:
+  // Overridden from NativeWidget:
   virtual void Close();
 
   // Overridden from ui::AnimationDelegate:
   virtual void AnimationEnded(const ui::Animation* animation);
   virtual void AnimationProgressed(const ui::Animation* animation);
 
 #ifdef UNIT_TEST
   views::View* contents() const { return contents_; }
 #endif
 
@@ skipping 11 matching lines @@
   virtual void InitBubble(views::Widget* parent,
                           const gfx::Rect& position_relative_to,
                           views::BubbleBorder::ArrowLocation arrow_location,
                           views::View* contents,
                           BubbleDelegate* delegate);
 
   // Instantiates and returns the BorderContents this Bubble should use.
   // Subclasses can return their own BorderContents implementation.
   virtual BorderContents* CreateBorderContents();
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // Overridden from NativeWidgetAura:
+  // TODO(beng): OnActivate();
+#elif defined(OS_WIN)
   // Overridden from NativeWidgetWin:
   virtual void OnActivate(UINT action, BOOL minimized, HWND window);
 #elif defined(TOOLKIT_USES_GTK)
   // Overridden from NativeWidgetGtk:
   virtual void OnActiveChanged() OVERRIDE;
 #endif
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+#elif defined(OS_WIN)
   // The window used to render the padding, border and arrow.
   BorderWidgetWin* border_;
 #elif defined(TOOLKIT_USES_GTK)
   // The view displaying the border.
   BorderContents* border_contents_;
 #endif
 
  private:
   enum ShowStatus {
     kOpen,
@@ skipping 45 matching lines @@
   views::BubbleBorder::ArrowLocation arrow_location_;
 
   views::View* contents_;
 
   bool accelerator_registered_;
 
   DISALLOW_COPY_AND_ASSIGN(Bubble);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_