| Index: chrome/browser/ui/views/profiles/avatar_menu_button.h
|
| diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.h b/chrome/browser/ui/views/profiles/avatar_menu_button.h
|
| index 189ed7572fe3d27b6d063961a1c6ed330a15c396..4898cd78f19cb1a4f0692c3cfd3015a28ea48de5 100644
|
| --- a/chrome/browser/ui/views/profiles/avatar_menu_button.h
|
| +++ b/chrome/browser/ui/views/profiles/avatar_menu_button.h
|
| @@ -11,6 +11,7 @@
|
| #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;
|
| @@ -24,7 +25,8 @@ 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[];
|
| @@ -38,7 +40,10 @@ class AvatarMenuButton : public views::MenuButton,
|
| // views::MenuButton:
|
| virtual const char* GetClassName() const OVERRIDE;
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
|
| +
|
| + // views::ViewTargeterDelegate:
|
| + virtual bool DoesIntersectRect(const views::View* target,
|
| + const gfx::Rect& rect) const 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.
|
|
|