Fix sign-in error strings.

chrome/browser/ui/views/profiles/new_avatar_button.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
@@ skipping 35 matching lines @@
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(
     views::ButtonListener* listener,
     const base::string16& profile_name,
     AvatarButtonStyle button_style,
     Browser* browser)
     : MenuButton(listener, GetElidedText(profile_name), NULL, true),
       browser_(browser) {
   set_animate_on_state_change(false);
+  set_icon_placement(ICON_ON_RIGHT);
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
 
   bool is_win8 = false;
 #if defined(OS_WIN)
   is_win8 = base::win::GetVersion() >= base::win::VERSION_WIN8;
 #endif
 
   if (button_style == THEMED_BUTTON) {
     const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL);
@@ skipping 15 matching lines @@
     const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_NORMAL);
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     set_menu_marker(
         rb->GetImageNamed(IDR_AVATAR_GLASS_BUTTON_DROPARROW).ToImageSkia());
   }
 
   g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
+
+  // Subscribe to authentication error changes so that the avatar button
+  // can update itself.
+  SigninErrorController* error =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())->
+          signin_error_controller();
+  error->AddObserver(this);
+  OnErrorChanged();
+
   SchedulePaint();
 }
 
 NewAvatarButton::~NewAvatarButton() {
   g_browser_process->profile_manager()->
       GetProfileInfoCache().RemoveObserver(this);
+  SigninErrorController* error =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())->
+          signin_error_controller();
+  error->RemoveObserver(this);
 }
 
-void NewAvatarButton::OnPaint(gfx::Canvas* canvas) {
-  // From TextButton::PaintButton, draw everything but the text.
-  OnPaintBackground(canvas);
-  OnPaintBorder(canvas);
-  views::Painter::PaintFocusPainter(this, canvas, focus_painter());
-
-  gfx::Rect rect;
-  // In RTL languages the marker gets drawn leftmost, so account for its offset.
-  if (base::i18n::IsRTL())
-    rect = gfx::Rect(-kInset, 0, size().width(), size().height());
-  else
-    rect = gfx::Rect(kInset, 0, size().width(), size().height());
-
+void NewAvatarButton::OnPaintText(gfx::Canvas* canvas, PaintButtonMode mode) {
+  gfx::Rect rect = GetTextBounds();
+  rect.Offset(0, -3);

[noms (inactive), 2014/05/16 13:37:04]

This change gets my spider senses tingly. Does it still work in RTL?  Also, why
-3? Does this still work with the normal, non-error state drop down arrow?

[Roger Tawa OOO till Jul 10th, 2014/05/16 19:43:49]

Oops, I thought GetTextBounds() handled it, but does not.  Fixed.  Also removed
the hacky -3.

   canvas->DrawStringRectWithHalo(
       text(),
       gfx::FontList(),
       SK_ColorWHITE,
       SK_ColorDKGRAY,
       rect,
       gfx::Canvas::NO_SUBPIXEL_RENDERING);
-
-  // From MenuButton::PaintButton, paint the marker
-  PaintMenuMarker(canvas);
 }
 
 void NewAvatarButton::OnProfileAdded(const base::FilePath& profile_path) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::OnProfileWasRemoved(
       const base::FilePath& profile_path,
       const base::string16& profile_name) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::OnProfileNameChanged(
       const base::FilePath& profile_path,
       const base::string16& old_profile_name) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
+void NewAvatarButton::OnErrorChanged() {
+  gfx::ImageSkia icon;
+
+  // If there is an error, show an warning icon.
+  SigninErrorController* error =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())->
+          signin_error_controller();
+  if (error->HasError()) {
+    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+    icon = *rb->GetImageNamed(IDR_WARNING).ToImageSkia();
+  }
+
+  SetIcon(icon);

[noms (inactive), 2014/05/16 13:37:04]

Should you maybe just move the icon bit in the if check? it doesn't seem to be
used unless there is an error.

[Roger Tawa OOO till Jul 10th, 2014/05/16 19:43:49]

Nope.  In case there is no longer an error, I want to clear the icon.

+  UpdateAvatarButtonAndRelayoutParent();
+}
+
 void NewAvatarButton::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
   ClearMaxTextSize();
   SetText(GetElidedText(
       profiles::GetAvatarNameForProfile(browser_->profile())));
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
-  parent()->Layout();
+  if (parent())

[noms (inactive), 2014/05/16 13:37:04]

Can parent() ever even return null? 

[Roger Tawa OOO till Jul 10th, 2014/05/16 19:43:49]

Yup, when called from OnErrorChanged() when this latter one is called from ctor.

+    parent()->Layout();
 }