Refactor ProfileInfoCache in c/b/ui/views

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 <utility>
 
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ skipping 71 matching lines @@
   } else {
     const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_NORMAL);
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     generic_avatar_ =
         *rb->GetImageNamed(IDR_AVATAR_NATIVE_BUTTON_AVATAR).ToImageSkia();
   }
 
-  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
+  g_browser_process->profile_manager()->
+      GetProfileAttributesStorage().AddObserver(this);
 
   // Subscribe to authentication error changes so that the avatar button can
   // update itself.  Note that guest mode profiles won't have a token service.
   SigninErrorController* error =
       profiles::GetSigninErrorController(browser_->profile());
   if (error) {
     error->AddObserver(this);
     OnErrorChanged();  // This calls Update().
   } else {
     Update();
   }
   SchedulePaint();
 }
 
 NewAvatarButton::~NewAvatarButton() {
   g_browser_process->profile_manager()->
-      GetProfileInfoCache().RemoveObserver(this);
+      GetProfileAttributesStorage().RemoveObserver(this);
   SigninErrorController* error =
       profiles::GetSigninErrorController(browser_->profile());
   if (error)
     error->RemoveObserver(this);
 }
 
 bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) {
   // Prevent the bubble from being re-shown if it's already showing.
   suppress_mouse_released_action_ = ProfileChooserView::IsShowing();
   return LabelButton::OnMousePressed(event);
@@ skipping 46 matching lines @@
 void NewAvatarButton::OnErrorChanged() {
   // If there is an error, show an warning icon.
   const SigninErrorController* error =
       profiles::GetSigninErrorController(browser_->profile());
   has_auth_error_ = error && error->HasError();
 
   Update();
 }
 
 void NewAvatarButton::Update() {
-  const ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
+  ProfileAttributesStorage& storage =
+      g_browser_process->profile_manager()->GetProfileAttributesStorage();
 
   // If we have a single local profile, then use the generic avatar
   // button instead of the profile name. Never use the generic button if
   // the active profile is Guest.
   bool use_generic_button = (!browser_->profile()->IsGuestSession() &&

[Peter Kasting, 2016/02/16 20:49:54]

Wrapping/indenting here is now strange

[lwchkg, 2016/02/17 17:09:31]

I see. Let's see if the new version (the ! is wrapped to the next line) is more
readable.

[Peter Kasting, 2016/02/17 22:16:26]

Yeah, looks much better.

-                             cache.GetNumberOfProfiles() == 1 &&
-                             !cache.ProfileIsAuthenticatedAtIndex(0));
+      storage.GetNumberOfProfiles() == 1 &&
+      !(*storage.GetAllProfilesAttributes().begin())->IsAuthenticated());

[lwchkg, 2016/02/14 17:07:18]

begin() will be changed to cbegin() in the next patch.

[Peter Kasting, 2016/02/16 20:49:54]

Nit: Just use front() instead:

      !storage.GetAllProfilesAttributes().front()->IsAuthenticated());

 
   SetText(use_generic_button ? base::string16() :
       profiles::GetAvatarButtonTextForProfile(browser_->profile()));
 
   // If the button has no text, clear the text shadows to make sure the
   // image is centered correctly.
   SetTextShadows(
       use_generic_button
           ? gfx::ShadowValues()
           : gfx::ShadowValues(
@@ skipping 12 matching lines @@
     SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia());
   }
 
   // If we are not using the generic button, then reset the spacing between
   // the text and the possible authentication error icon.
   const int kDefaultImageTextSpacing = 5;
   SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing);
 
   PreferredSizeChanged();
 }