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

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

Issue 297143008: [Win] UI fixes for the new avatar button/bubble auth errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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.cc
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc
index 70d66895d109de21be7074c02772572b55f5abe1..f099eb291d784f76368d62d4c786144c733c9a09 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_button.cc
+++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc
@@ -32,7 +32,6 @@ scoped_ptr<views::Border> CreateBorder(const int normal_image_set[],
const int pushed_image_set[]) {
scoped_ptr<views::LabelButtonBorder> border(
new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON));
-
border->SetPainter(false, views::Button::STATE_NORMAL,
views::Painter::CreateImageGridPainter(normal_image_set));
border->SetPainter(false, views::Button::STATE_HOVERED,
@@ -158,8 +157,8 @@ void NewAvatarButton::OnErrorChanged() {
const SigninErrorController* error =
profiles::GetSigninErrorController(browser_->profile());
if (error && error->HasError()) {
- ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
- icon = *rb->GetImageNamed(IDR_WARNING).ToImageSkia();
+ icon = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+ IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).ToImageSkia();
}
SetImage(views::Button::STATE_NORMAL, icon);
« no previous file with comments | « chrome/browser/ui/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698