Stop using the old-style profile names when using --new-profile-management

chrome/browser/ui/views/new_avatar_button.cc

 // Copyright 2013 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/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/ui/browser.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 69 matching lines @@
   } else {
     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());
   }
 
-  avatar_menu_.reset(new AvatarMenu(
-      &g_browser_process->profile_manager()->GetProfileInfoCache(),
-      this,
-      browser_));
-  avatar_menu_->RebuildMenu();
-
+  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
   SchedulePaint();
 }
 
 NewAvatarButton::~NewAvatarButton() {
+  g_browser_process->profile_manager()->
+      GetProfileInfoCache().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());
 
   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::OnAvatarMenuChanged(AvatarMenu* avatar_menu) {
+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::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
   ClearMaxTextSize();
-  SetText(GetElidedText(profiles::GetActiveProfileDisplayName(browser_)));
+  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();
 }