Bringing back fast user switching on desktop user menu

chrome/browser/profiles/profile_avatar_icon_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_AVATAR_ICON_UTIL_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_AVATAR_ICON_UTIL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 21 matching lines @@
 
 // Avatar formatting.
 extern const int kAvatarIconWidth;
 extern const int kAvatarIconHeight;
 extern const SkColor kAvatarTutorialBackgroundColor;
 extern const SkColor kAvatarTutorialContentTextColor;
 extern const SkColor kAvatarBubbleAccountsBackgroundColor;
 extern const SkColor kAvatarBubbleGaiaBackgroundColor;
 extern const SkColor kUserManagerBackgroundColor;
 
+// Avatar shape.
+enum AvatarShape {
+  SHAPE_CIRCLE,  // Only available for desktop platforms
+  SHAPE_SQUARE,
+};
+
 // Returns a version of |image| of a specific size. Note that no checks are
 // done on the width/height so make sure they're reasonable values; in the
 // range of 16-256 is probably best.
 gfx::Image GetSizedAvatarIcon(const gfx::Image& image,
                               bool is_rectangle,
-                              int width, int height);
+                              int width,
+                              int height,
+                              AvatarShape shape=SHAPE_SQUARE);

[anthonyvd, 2016/06/28 14:50:46]

nit: I think you want spaces around = here

We also tend to avoid default arguments in favor of overloading where possible
(https://google.github.io/styleguide/cppguide.html#Default_Arguments). You could
instead overload the constructor and use delegating constructors.

For example: 

gfx:Image GetSizedAvatarIcon(..., AvatarShape shape) { ... }
gfx:Image GetSizedAvatarIcon(...) : GetSizedAvatarIcon(..., shape) { }

[Jane, 2016/06/28 16:32:53]

Thanks! Good to learn. I modified both functions to follow this format.
Regarding the space, git cl format does force that, but Roger told me to remove
them in a previous comment...

 
 // Returns a version of |image| suitable for use in menus.
 gfx::Image GetAvatarIconForMenu(const gfx::Image& image,
                                 bool is_rectangle);
 
 // Returns a version of |image| suitable for use in WebUI.
 gfx::Image GetAvatarIconForWebUI(const gfx::Image& image,
                                  bool is_rectangle);
 
 // Returns a version of |image| suitable for use in title bars. The returned
@@ skipping 52 matching lines @@
     const GURL& old_url, int thumbnail_size, GURL* new_url);
 
 // Returns a list of dictionaries containing the default profile avatar icons as
 // well as avatar labels used for accessibility purposes. The list is ordered
 // according to the avatars' default order.
 std::unique_ptr<base::ListValue> GetDefaultProfileAvatarIconsAndLabels();
 
 }  // namespace profiles
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_AVATAR_ICON_UTIL_H_