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 <string>
@@ skipping 19 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,

[Roger Tawa OOO till Jul 10th, 2016/06/17 14:35:57]

You should remove the enum value here with an #ifdef.

Alternatively, add a comment here that says CIRCLE is only available on desktop
platforms and then add a DCHECK to enforce this in the cc file.

[Jane, 2016/06/20 13:10:24]

I tried putting the enum definition under #ifdef (see patch 8), but the Android
tests failed with the error below. I'm confused because I don't see how the
compiler would think it's ambiguous given the two candidate definitions.
Besides, the first definition in the header file shouldn't even have AvatarShape
for OS_ANDROID, and should be the same definition as the one in .cc. Do you know
why this is happening and how I could fix it? Thanks!

../../chrome/browser/profiles/profile_avatar_icon_util.cc: In function
'gfx::Image profiles::GetAvatarIconForMenu(const gfx::Image&, bool)':
../../chrome/browser/profiles/profile_avatar_icon_util.cc:310:63: error: call of
overloaded 'GetSizedAvatarIcon(const gfx::Image&, bool&, const int&, const
int&)' is ambiguous
       image, is_rectangle, kAvatarIconWidth, kAvatarIconHeight);
                                                               ^
../../chrome/browser/profiles/profile_avatar_icon_util.cc:310:63: note:
candidates are:
In file included from
../../chrome/browser/profiles/profile_avatar_icon_util.cc:5:0:
../../chrome/browser/profiles/profile_avatar_icon_util.h:56:12: note: gfx::Image
profiles::GetSizedAvatarIcon(const gfx::Image&, bool, int, int,
profiles::AvatarShape)
 gfx::Image GetSizedAvatarIcon(const gfx::Image& image,
            ^
../../chrome/browser/profiles/profile_avatar_icon_util.cc:277:12: note:
gfx::Image profiles::GetSizedAvatarIcon(const gfx::Image&, bool, int, int)
 gfx::Image GetSizedAvatarIcon(const gfx::Image& image,


I also tried the DCHECK way (see patch 9) and the test passed. I would say the
code looks cleaner, but definitely not as rigorous.

[Roger Tawa OOO till Jul 10th, 2016/06/20 14:04:44]

Not sure about ambiguity.

+  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);
 
 // 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 47 matching lines @@
 //   or
 //   https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s64-c/photo.jpg
 // then return value in |new_url| would be:
 //   https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s256-c/photo.jpg
 bool GetImageURLWithThumbnailSize(
     const GURL& old_url, int thumbnail_size, GURL* new_url);
 
 }  // namespace profiles
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_AVATAR_ICON_UTIL_H_