Merge 108537 - Align avatar bubble with edge of anchor control

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 "base/observer_list.h"
 #include "views/bubble/bubble_border.h"
@@ skipping 94 matching lines @@
   // another window is activated. You can explicitly close the bubble by
   // invoking Close().
   // |arrow_location| specifies preferred bubble alignment.
   // You may provide an optional |delegate| to:
   //     - Be notified when the Bubble is closed.
   //     - Prevent the Bubble from being closed when the Escape key is
   //       pressed (the default behavior).
   static 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);
 
 #if defined(OS_CHROMEOS)
   // Shows the Bubble without grabbing the focus. Doesn't set the Escape
   // accelerator so user code is responsible for closing the bubble on pressing
   // the Esc key. Others are the same as above. TYPE_POPUP widget is used
   // to achieve the focusless effect. If |show_while_screen_is_locked| is true,
   // a property is set telling the window manager to continue showing the bubble
   // even while the screen is locked.
   static 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);
 #endif
 
   // Resizes and potentially moves the Bubble to best accommodate the
   // contents preferred size.
   void SizeToContents();
 
   // Whether the Bubble should fade away when it closes. Generally speaking,
@@ skipping 35 matching lines @@
 #if defined(OS_CHROMEOS)
   Bubble(views::Widget::InitParams::Type type,
          bool show_while_screen_is_locked);
 #endif
   virtual ~Bubble();
 
   // Creates the Bubble.
   virtual void InitBubble(views::Widget* parent,
                           const gfx::Rect& position_relative_to,
                           views::BubbleBorder::ArrowLocation arrow_location,
+                          views::BubbleBorder::BubbleAlignment alignment,
                           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(USE_AURA)
   // Overridden from NativeWidgetAura:
   // TODO(beng): OnActivate();
@@ skipping 75 matching lines @@
   views::View* contents_;
 
   bool accelerator_registered_;
 
   ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(Bubble);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_