Gets Bubble to work on 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"
@@ skipping 93 matching lines @@
     // 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(USE_AURA)
-  // TODO(beng):
-  (void)opacity;
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   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(USE_AURA)
       views::NativeWidgetAura(new views::Widget),
 #elif defined(OS_WIN)
       views::NativeWidgetWin(new views::Widget),
 #elif defined(TOUCH_UI)
       views::NativeWidgetViews(new views::Widget),
 #elif defined(TOOLKIT_USES_GTK)
       views::NativeWidgetGtk(new views::Widget),
 #endif
-#if defined(USE_AURA)
-#elif defined(TOOLKIT_USES_GTK)
+#if defined(OS_WIN) && !defined(USE_AURA)
+      border_(NULL),
+#else
       border_contents_(NULL),
-#elif defined(OS_WIN)
-      border_(NULL),
 #endif
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
       close_on_deactivate_(true),
 #if defined(TOOLKIT_USES_GTK)
       type_(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS),
 #endif
 #if defined(OS_CHROMEOS)
       show_while_screen_is_locked_(false),
 #endif
       arrow_location_(views::BubbleBorder::NONE),
       contents_(NULL),
       accelerator_registered_(false) {
 }
 
 #if defined(OS_CHROMEOS)
 Bubble::Bubble(views::Widget::InitParams::Type type,
                bool show_while_screen_is_locked)
 #if defined(USE_AURA)
     : views::NativeWidgetAura(new views::Widget),
 #elif defined(TOUCH_UI)
     : views::NativeWidgetViews(new views::Widget),
 #else
     : views::NativeWidgetGtk(new views::Widget),
 #endif
-#if defined(TOOLKIT_USES_GTK)
       border_contents_(NULL),
-#endif
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
 #if defined(TOOLKIT_USES_GTK)
       type_(type),
 #endif
       show_while_screen_is_locked_(show_while_screen_is_locked),
       arrow_location_(views::BubbleBorder::NONE),
       contents_(NULL),
       accelerator_registered_(false) {
@@ skipping 86 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(USE_AURA)
-  // TODO(beng):
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // 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 45 matching lines @@
   accelerator_registered_ = false;
 }
 
 BorderContents* Bubble::CreateBorderContents() {
   return new BorderContents();
 }
 
 void Bubble::SizeToContents() {
   gfx::Rect window_bounds;
 
-#if defined(USE_AURA)
-  // TODO(beng):
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // 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(USE_AURA)
-// TODO(beng):
+void Bubble::OnLostActive() {
+  GetWidget()->Close();
+}
 #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) {
     if (close_on_deactivate_)
       GetWidget()->Close();
   } else if (action == WA_ACTIVE) {
     DCHECK(GetWidget()->GetRootView()->has_children());
     GetWidget()->GetRootView()->child_at(0)->RequestFocus();
   }
@@ skipping 12 matching lines @@
 void Bubble::DoClose(bool closed_by_escape) {
   if (show_status_ == kClosed)
     return;
 
   if (accelerator_registered_)
     UnregisterEscapeAccelerator();
   if (delegate_)
     delegate_->BubbleClosing(this, closed_by_escape);
   FOR_EACH_OBSERVER(Observer, observer_list_, OnBubbleClosing());
   show_status_ = kClosed;
-#if defined(USE_AURA)
-  // TODO(beng):
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   border_->Close();
 #endif
 #if defined(USE_AURA)
-  // TODO(beng):
-  NOTIMPLEMENTED();
+  NativeWidgetAura::Close();
 #elif defined(OS_WIN)
   NativeWidgetWin::Close();
 #elif defined(TOUCH_UI)
   NativeWidgetViews::Close();
 #elif defined(TOOLKIT_USES_GTK)
   NativeWidgetGtk::Close();
 #endif
 }
 
 void Bubble::FadeIn() {
@@ skipping 28 matching lines @@
     animation_->Hide();
 }
 
 bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }