Merge 108537 - Align avatar bubble with edge of anchor control

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 33 matching lines @@
 string16 BubbleDelegate::GetAccessibleName() {
   return string16();
 }
 
 // Bubble -----------------------------------------------------------------
 
 // static
 Bubble* Bubble::Show(views::Widget* parent,
                      const gfx::Rect& position_relative_to,
                      views::BubbleBorder::ArrowLocation arrow_location,
+                     views::BubbleBorder::BubbleAlignment alignment,
                      views::View* contents,
                      BubbleDelegate* delegate) {
   Bubble* bubble = new Bubble;
-  bubble->InitBubble(parent, position_relative_to, arrow_location,
+  bubble->InitBubble(parent, position_relative_to, arrow_location, alignment,
                      contents, delegate);
 
   // Register the Escape accelerator for closing.
   bubble->RegisterEscapeAccelerator();
 
   if (delegate)
     delegate->BubbleShown();
 
   return bubble;
 }
 
 #if defined(OS_CHROMEOS)
 // static
 Bubble* Bubble::ShowFocusless(
     views::Widget* parent,
     const gfx::Rect& position_relative_to,
     views::BubbleBorder::ArrowLocation arrow_location,
+    views::BubbleBorder::BubbleAlignment alignment,
     views::View* contents,
     BubbleDelegate* delegate,
     bool show_while_screen_is_locked) {
   Bubble* bubble = new Bubble(views::Widget::InitParams::TYPE_POPUP,
                               show_while_screen_is_locked);
-  bubble->InitBubble(parent, position_relative_to, arrow_location,
+  bubble->InitBubble(parent, position_relative_to, arrow_location, alignment,
                      contents, delegate);
   return bubble;
 }
 #endif
 
 void Bubble::Close() {
   if (show_status_ != kOpen)
     return;
 
   show_status_ = kClosing;
@@ skipping 93 matching lines @@
       contents_(NULL) {
 }
 #endif
 
 Bubble::~Bubble() {
 }
 
 void Bubble::InitBubble(views::Widget* parent,
                         const gfx::Rect& position_relative_to,
                         views::BubbleBorder::ArrowLocation arrow_location,
+                        views::BubbleBorder::BubbleAlignment alignment,
                         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(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);
 
   DCHECK(!border_);
   border_ = new BorderWidgetWin();
 
   border_->InitBorderWidgetWin(CreateBorderContents(), parent->GetNativeView());
   border_->border_contents()->SetBackgroundColor(kBackgroundColor);
+  border_->border_contents()->SetAlignment(alignment);
 
   // We make the BorderWidgetWin the owner of the Bubble HWND, so that the
   // latter is displayed on top of the former.
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.parent = border_->GetNativeView();
   params.native_widget = this;
   GetWidget()->Init(params);
 
   if (fade_in) {
     border_->SetOpacity(0);
@@ skipping 48 matching lines @@
   contents_view->SetLayoutManager(new views::FillLayout);
 
   // Paint the background color behind the contents.
   contents_view->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
 #else
   // Create a view to paint the border and background.
   border_contents_ = CreateBorderContents();
   border_contents_->Init();
   border_contents_->SetBackgroundColor(kBackgroundColor);
+  border_contents_->SetAlignment(alignment);
   gfx::Rect contents_bounds;
   border_contents_->SizeAndGetBounds(position_relative_to,
       arrow_location, false, contents->GetPreferredSize(),
       &contents_bounds, &window_bounds);
   // This new view must be added before |contents| so it will paint under it.
   contents_view->AddChildViewAt(border_contents_, 0);
 
   // |contents_view| has no layout manager, so we have to explicitly position
   // its children.
   border_contents_->SetBoundsRect(
@@ skipping 143 matching lines @@
     animation_->Hide();
 }
 
 bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }