Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / profiles / avatar_menu_button.h

diff --git a/src/chrome/browser/ui/views/profiles/avatar_menu_button.h b/src/chrome/browser/ui/views/profiles/avatar_menu_button.h
index 189ed75..343e467 100644 (file)
--- a/src/chrome/browser/ui/views/profiles/avatar_menu_button.h
+++ b/src/chrome/browser/ui/views/profiles/avatar_menu_button.h
@@ -11,12 +11,14 @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
+#include "ui/views/view_targeter_delegate.h"
 
 namespace gfx {
 class Canvas;
 class Image;
 }
 class Browser;
+class Profile;
 
 // AvatarMenuButton
 //
@@ -24,21 +26,21 @@ class Browser;
 // The button can optionally have a menu attached to it.
 
 class AvatarMenuButton : public views::MenuButton,
-                         public views::MenuButtonListener {
+                         public views::MenuButtonListener,
+                         public views::ViewTargeterDelegate {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
-  // Creates a new button. If |disabled| is true and we're not in managed mode,
-  // clicking on the button will cause the profile menu to be displayed.
+  // Creates a new button. Unless |disabled| is true, clicking on the button
+  // will cause the profile menu to be displayed.
   AvatarMenuButton(Browser* browser, bool disabled);
 
-  virtual ~AvatarMenuButton();
+  ~AvatarMenuButton() override;
 
   // views::MenuButton:
-  virtual const char* GetClassName() const OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
+  const char* GetClassName() const override;
+  void OnPaint(gfx::Canvas* canvas) override;
 
   // Sets the image for the avatar button. Rectangular images, as opposed
   // to Chrome avatar icons, will be resized and modified for the title bar.
@@ -49,10 +51,25 @@ class AvatarMenuButton : public views::MenuButton,
   }
   bool button_on_right() { return button_on_right_; }
 
+  // Get avatar images for the profile.  |avatar| is used in the browser window
+  // whereas |taskbar_badge_avatar| is used for the OS taskbar.  If
+  // |taskbar_badge_avatar| is empty then |avatar| should be used for the
+  // taskbar as well. Returns false if the cache doesn't have an entry for a
+  // Profile::REGULAR_PROFILE type |profile|, otherwise return true.
+  static bool GetAvatarImages(Profile* profile,
+                              bool should_show_avatar_menu,
+                              gfx::Image* avatar,
+                              gfx::Image* taskbar_badge_avatar,
+                              bool* is_rectangle);
+
  private:
+  // views::ViewTargeterDelegate:
+  bool DoesIntersectRect(const views::View* target,
+                         const gfx::Rect& rect) const override;
+
   // views::MenuButtonListener:
-  virtual void OnMenuButtonClicked(views::View* source,
-                                   const gfx::Point& point) OVERRIDE;
+  void OnMenuButtonClicked(views::View* source,
+                           const gfx::Point& point) override;
 
   Browser* browser_;
   bool disabled_;