Simplify some old avatar menu button code.

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 79 matching lines @@
   // Constructor. |observer| can be NULL. |browser| can be NULL and a new one
   // will be created if an action requires it.
   AvatarMenu(ProfileAttributesStorage* profile_storage,
              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.
+  // Sets |image| to the avatar corresponding to the profile at |profile_path|.
+  // For built-in profile avatars, returns the non-high res version.
   static void GetImageForMenuButton(const base::FilePath& profile_path,
-                                    gfx::Image* image,
-                                    bool* is_rectangle);
+                                    gfx::Image* image);
 
   // Opens a Browser with the specified profile in response to the user
   // selecting an item. If |always_create| is true then a new window is created
   // even if a window for that profile already exists.
   void SwitchToProfile(size_t index,
                        bool always_create,
                        ProfileMetrics::ProfileOpen metric);
 
   // Creates a new profile.
   void AddNewProfile(ProfileMetrics::ProfileAdd type);
@@ skipping 73 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_