Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: chrome/browser/ui/views/avatar_menu_button.h

Issue 8709001: Views: Custom drawing for GAIA avatar pictures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/avatar_menu_button.h
diff --git a/chrome/browser/ui/views/avatar_menu_button.h b/chrome/browser/ui/views/avatar_menu_button.h
index 407251732504756d57d5a23048b3a8251d0d01a0..7397b9522cb04229f41dd26a5d5c0dbc579dedec 100644
--- a/chrome/browser/ui/views/avatar_menu_button.h
+++ b/chrome/browser/ui/views/avatar_menu_button.h
@@ -15,6 +15,7 @@
namespace gfx {
class Canvas;
+class Image;
}
class Browser;
@@ -36,8 +37,8 @@ class AvatarMenuButton : public views::MenuButton,
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
virtual bool HitTest(const gfx::Point& point) const OVERRIDE;
- // views::TextButton
- virtual void SetIcon(const SkBitmap& icon) OVERRIDE;
+ virtual void SetIcon(const gfx::Image& icon,
+ bool is_gaia_picture);
void ShowAvatarBubble();
@@ -50,6 +51,11 @@ class AvatarMenuButton : public views::MenuButton,
bool set_taskbar_decoration_;
scoped_ptr<ui::MenuModel> menu_model_;
+ scoped_ptr<gfx::Image> icon_;
+ SkBitmap button_icon_;
+ bool is_gaia_picture_;
+ int old_height_;
+
DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton);
};

Powered by Google App Engine
This is Rietveld 408576698