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

Unified Diff: chrome/browser/ui/views/profiles/new_avatar_button.h

Issue 240453006: Fix sign-in error strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Extract separate CLs, fix new avatar button Created 6 years, 7 months 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/profiles/new_avatar_button.h
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.h b/chrome/browser/ui/views/profiles/new_avatar_button.h
index 3fad44f019c8abc2a4e1e9a66f167d911d5ac2f8..e9769f30904d3452c9d7009d15b81ae70013dec1 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_button.h
+++ b/chrome/browser/ui/views/profiles/new_avatar_button.h
@@ -6,13 +6,15 @@
#define CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
#include "chrome/browser/profiles/profile_info_cache_observer.h"
+#include "components/signin/core/browser/signin_error_controller.h"
#include "ui/views/controls/button/menu_button.h"
class Browser;
// Avatar button that displays the active profile's name in the caption area.
class NewAvatarButton : public views::MenuButton,
- public ProfileInfoCacheObserver {
+ public ProfileInfoCacheObserver,
+ public SigninErrorController::Observer {
public:
// Different button styles that can be applied.
enum AvatarButtonStyle {
@@ -26,8 +28,8 @@ class NewAvatarButton : public views::MenuButton,
Browser* browser);
virtual ~NewAvatarButton();
- // views::View:
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+ // views::TextButton:
+ virtual void OnPaintText(gfx::Canvas* canvas, PaintButtonMode mode);
private:
friend class NewAvatarMenuButtonTest;
@@ -44,6 +46,9 @@ class NewAvatarButton : public views::MenuButton,
const base::FilePath& profile_path,
const base::string16& old_profile_name) OVERRIDE;
+ // SigninErrorController::Observer:
+ virtual void OnErrorChanged() OVERRIDE;
+
// Called when the profile info cache has changed, which means we might
// have to re-display the profile name.
void UpdateAvatarButtonAndRelayoutParent();

Powered by Google App Engine
This is Rietveld 408576698