Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/views/bubble/bubble.cc

 // 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.
 
 #include "chrome/browser/ui/views/bubble/bubble.h"
 
 #include <vector>
 
 #include "chrome/browser/ui/views/bubble/border_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_utils.h"
 #include "views/layout/fill_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/client_view.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/bubble/border_widget_win.h"
 #endif
 
 using std::vector;
 
 // How long the fade should last for.
 static const int kHideFadeDurationMS = 200;
 
 // Background color of the bubble.
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 const SkColor Bubble::kBackgroundColor =
     color_utils::GetSysSkColor(COLOR_WINDOW);
 #else
 // TODO(beng): source from theme provider.
 const SkColor Bubble::kBackgroundColor = SK_ColorWHITE;
 #endif
 
 // BubbleDelegate ---------------------------------------------------------
 
 std::wstring BubbleDelegate::accessible_name() {
@@ skipping 45 matching lines @@
     FadeOut();
   else
     DoClose(false);
 }
 
 void Bubble::AnimationEnded(const ui::Animation* animation) {
   if (static_cast<int>(animation_->GetCurrentValue()) == 0) {
     // When fading out we just need to close the bubble at the end
     DoClose(false);
   } else {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     // When fading in we need to remove the layered window style flag, since
     // that style prevents some bubble content from working properly.
     SetWindowLong(GWL_EXSTYLE, GetWindowLong(GWL_EXSTYLE) & ~WS_EX_LAYERED);
 #endif
   }
 }
 
 void Bubble::AnimationProgressed(const ui::Animation* animation) {
   // Set the opacity for the main contents window.
   unsigned char opacity = static_cast<unsigned char>(
       animation_->GetCurrentValue() * 255);
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+#elif defined(OS_WIN)

[sky, 2011/09/06 17:22:48]

NOTIMPLEMENTED?

   SetLayeredWindowAttributes(GetNativeView(), 0,
       static_cast<byte>(opacity), LWA_ALPHA);
   contents_->SchedulePaint();
 
   // Also fade in/out the bubble border window.
   border_->SetOpacity(opacity);
   border_->border_contents()->SchedulePaint();
 #else
   SetOpacity(opacity);
   border_contents_->SchedulePaint();
 #endif
 }
 
 Bubble::Bubble()
     :
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+      views::NativeWidgetAura(new views::Widget),
+#elif defined(OS_WIN)
       views::NativeWidgetWin(new views::Widget),
 #elif defined(TOOLKIT_USES_GTK)
       views::NativeWidgetGtk(new views::Widget),
 #endif
-#if defined(TOOLKIT_USES_GTK)
+#if defined(USE_AURA)
+#elif defined(TOOLKIT_USES_GTK)
       border_contents_(NULL),
 #elif defined(OS_WIN)
       border_(NULL),
 #endif
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
 #if defined(TOOLKIT_USES_GTK)
       type_(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS),
 #endif
@@ skipping 28 matching lines @@
                         views::BubbleBorder::ArrowLocation arrow_location,
                         views::View* contents,
                         BubbleDelegate* delegate) {
   delegate_ = delegate;
   position_relative_to_ = position_relative_to;
   arrow_location_ = arrow_location;
   contents_ = contents;
   const bool fade_in = delegate_ && delegate_->FadeInOnShow();
 
   // Create the main window.
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#elif defined(OS_WIN)
   views::Widget* parent_window = parent->GetTopLevelWidget();
   if (parent_window)
     parent_window->DisableInactiveRendering();
   set_window_style(WS_POPUP | WS_CLIPCHILDREN);
   int extended_style = WS_EX_TOOLWINDOW;
   // During FadeIn we need to turn on the layered window style to deal with
   // transparency. This flag needs to be reset after fading in is complete.
   if (fade_in)
     extended_style |= WS_EX_LAYERED;
   set_window_ex_style(extended_style);
@@ skipping 44 matching lines @@
   // (e.g. calling SetChecked() on checkboxes is safe).
   GetWidget()->SetContentsView(contents_view);
   // Adding |contents| as a child has to be done before we call
   // contents->GetPreferredSize() below, since some supplied views don't
   // actually initialize themselves until they're added to a hierarchy.
   contents_view->AddChildView(contents);
 
   // Calculate and set the bounds for all windows and views.
   gfx::Rect window_bounds;
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#elif defined(OS_WIN)
   // Initialize and position the border window.
   window_bounds = border_->SizeAndGetBounds(position_relative_to,
                                             arrow_location,
                                             contents->GetPreferredSize());
 
   // Make |contents| take up the entire contents view.
   contents_view->SetLayoutManager(new views::FillLayout);
 
   // Paint the background color behind the contents.
   contents_view->set_background(
@@ skipping 12 matching lines @@
 
   // |contents_view| has no layout manager, so we have to explicitly position
   // its children.
   border_contents_->SetBoundsRect(
       gfx::Rect(gfx::Point(), window_bounds.size()));
   contents->SetBoundsRect(contents_bounds);
 #endif
   GetWidget()->SetBounds(window_bounds);
 
   // Show the window.
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#elif defined(OS_WIN)
   border_->ShowWindow(SW_SHOW);
   ShowWindow(SW_SHOW);
 #elif defined(TOOLKIT_USES_GTK)
   GetWidget()->Show();
 #endif
 
   if (fade_in)
     FadeIn();
 }
 
@@ skipping 10 matching lines @@
   accelerator_registered_ = false;
 }
 
 BorderContents* Bubble::CreateBorderContents() {
   return new BorderContents();
 }
 
 void Bubble::SizeToContents() {
   gfx::Rect window_bounds;
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#elif defined(OS_WIN)
   // Initialize and position the border window.
   window_bounds = border_->SizeAndGetBounds(position_relative_to_,
                                             arrow_location_,
                                             contents_->GetPreferredSize());
 #else
   gfx::Rect contents_bounds;
   border_contents_->SizeAndGetBounds(position_relative_to_,
       arrow_location_, false, contents_->GetPreferredSize(),
       &contents_bounds, &window_bounds);
   // |contents_view| has no layout manager, so we have to explicitly position
   // its children.
   border_contents_->SetBoundsRect(
       gfx::Rect(gfx::Point(), window_bounds.size()));
   contents_->SetBoundsRect(contents_bounds);
 #endif
   GetWidget()->SetBounds(window_bounds);
 }
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+// TODO(beng):
+#elif defined(OS_WIN)
 void Bubble::OnActivate(UINT action, BOOL minimized, HWND window) {
   // The popup should close when it is deactivated.
   if (action == WA_INACTIVE) {
     GetWidget()->Close();
   } else if (action == WA_ACTIVE) {
     DCHECK(GetWidget()->GetRootView()->has_children());
     GetWidget()->GetRootView()->child_at(0)->RequestFocus();
   }
 }
 #elif defined(TOOLKIT_USES_GTK)
 void Bubble::OnActiveChanged() {
   if (!GetWidget()->IsActive())
     GetWidget()->Close();
 }
 #endif
 
 void Bubble::DoClose(bool closed_by_escape) {
   if (show_status_ == kClosed)
     return;
 
   if (accelerator_registered_)
     UnregisterEscapeAccelerator();
   if (delegate_)
     delegate_->BubbleClosing(this, closed_by_escape);
   show_status_ = kClosed;
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#elif defined(OS_WIN)
   border_->Close();
 #endif
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#elif defined(OS_WIN)
   NativeWidgetWin::Close();
 #elif defined(TOOLKIT_USES_GTK)
   NativeWidgetGtk::Close();
 #endif
 }
 
 void Bubble::FadeIn() {
   Fade(true);  // |fade_in|.
 }
 
 void Bubble::FadeOut() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // The contents window cannot have the layered flag on by default, since its
   // content doesn't always work inside a layered window, but when animating it
   // is ok to set that style on the window for the purpose of fading it out.
   SetWindowLong(GWL_EXSTYLE, GetWindowLong(GWL_EXSTYLE) | WS_EX_LAYERED);
   // This must be the very next call, otherwise we can get flicker on close.
   SetLayeredWindowAttributes(GetNativeView(), 0,
       static_cast<byte>(255), LWA_ALPHA);
 #endif

[sky, 2011/09/06 17:22:48]

#else NOTIMPLEMNETED?

 
   Fade(false);  // |fade_in|.
 }
 
 void Bubble::Fade(bool fade_in) {
   animation_.reset(new ui::SlideAnimation(this));
   animation_->SetSlideDuration(kHideFadeDurationMS);
   animation_->SetTweenType(ui::Tween::LINEAR);
 
   animation_->Reset(fade_in ? 0.0 : 1.0);
   if (fade_in)
     animation_->Show();
   else
     animation_->Hide();
 }
 
 bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }