Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/profiles/avatar_menu.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 11 matching lines @@
 #include "ui/gfx/image/image.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #endif
 
 class AvatarMenuActions;
 class AvatarMenuObserver;
 class Browser;
 class Profile;
+class ProfileAttributesStorage;
 class ProfileInfoInterface;
 class ProfileList;
 class SupervisedUserService;
 
 // This class represents the menu-like interface used to select profiles,
 // such as the bubble that appears when the avatar icon is clicked in the
 // browser window frame. This class will notify its observer when the backend
 // data changes, and the view for this model should forward actions
 // back to it in response to user events.
 class AvatarMenu :
@@ skipping 41 matching lines @@
 
     // The index in the |profile_cache| for this profile.
     size_t profile_index;
 
     // The path of this profile.
     base::FilePath profile_path;
   };
 
   // Constructor. |observer| can be NULL. |browser| can be NULL and a new one
   // will be created if an action requires it.
-  AvatarMenu(ProfileInfoInterface* profile_cache,
+  AvatarMenu(ProfileAttributesStorage* /*profile_storage*/,

[Mike Lerman, 2016/02/19 15:08:12]

Wait... why aren't you giving a name to the first variable? Even if you're not
using it, you can still name it.

[lwchkg, 2016/02/19 16:46:04]

AFAIK this results in a compiler warning (which is treated as errors.) Anyway, I
forgot which compiler generates the warning. Will try and see after rebasing and
recompiling, which should take me a couple of hours.

[lwchkg, 2016/02/20 05:20:03]

No compile failures. I was too paranoid.

              AvatarMenuObserver* observer,
              Browser* browser);
   ~AvatarMenu() override;
 
   // True if avatar menu should be displayed.
   static bool ShouldShowAvatarMenu();
 
   // Sets |image| to the avatar corresponding to the profile at |profile_path|
   // and sets |is_rectangle| to true unless |image| is a built-in profile
   // avatar. For built-in profile avatars, returns the non-high res version.
@@ skipping 86 matching lines @@
   // The observer of this model, which is notified of changes. Weak.
   AvatarMenuObserver* observer_;
 
   // Browser in which this avatar menu resides. Weak.
   Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_