[Mac] Redesign the avatar bubble UI

chrome/browser/profiles/profile_avatar_icon_util.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/profiles/profile_avatar_icon_util.h"
 
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 163 matching lines @@
 
 }  // namespace
 
 namespace profiles {
 
 const int kAvatarIconWidth = 38;
 const int kAvatarIconHeight = 31;
 const int kAvatarIconPadding = 2;
 const SkColor kAvatarTutorialBackgroundColor = SkColorSetRGB(0x42, 0x85, 0xf4);
 const SkColor kAvatarTutorialContentTextColor = SkColorSetRGB(0xc6, 0xda, 0xfc);
+const SkColor kAvatarBubbleAccountsBackgroundColor =
+    SkColorSetRGB(0xf3, 0xf3, 0xf3);
 
 const char kDefaultUrlPrefix[] = "chrome://theme/IDR_PROFILE_AVATAR_";
 const char kGAIAPictureFileName[] = "Google Profile Picture.png";
 const char kHighResAvatarFolderName[] = "Avatars";
 
 const int kDefaultAvatarIconResources[] = {
   IDR_PROFILE_AVATAR_0,
   IDR_PROFILE_AVATAR_1,
   IDR_PROFILE_AVATAR_2,
   IDR_PROFILE_AVATAR_3,
@@ skipping 50 matching lines @@
   "avatar_margarita.png",
   "avatar_note.png",
   "avatar_sun_cloud.png",
 };
 
 const size_t kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources);
 
 // The first 8 icons are generic.
 const size_t kGenericAvatarIconsCount = 8;
 
-gfx::Image GetSizedAvatarIconWithBorder(const gfx::Image& image,
-                                        bool is_rectangle,
-                                        int width, int height) {
+gfx::Image GetSizedAvatarIcon(const gfx::Image& image,
+                              bool is_rectangle,
+                              int width, int height) {
   if (!is_rectangle)
     return image;
 
   gfx::Size size(width, height);
 
   // Source for a centered, sized icon with a border.
   scoped_ptr<gfx::ImageSkiaSource> source(
       new AvatarImageSource(
           *image.ToImageSkia(),
           size,
           std::min(width, height),
           AvatarImageSource::POSITION_CENTER,
-          AvatarImageSource::BORDER_NORMAL));
+          AvatarImageSource::BORDER_NONE));
 
   return gfx::Image(gfx::ImageSkia(source.release(), size));
 }
 
 gfx::Image GetAvatarIconForMenu(const gfx::Image& image,
                                 bool is_rectangle) {
-  return GetSizedAvatarIconWithBorder(
+  return GetSizedAvatarIcon(
       image, is_rectangle, kAvatarIconWidth, kAvatarIconHeight);
 }
 
 gfx::Image GetAvatarIconForWebUI(const gfx::Image& image,
                                  bool is_rectangle) {
-  if (!is_rectangle)
-    return image;
-
-  gfx::Size size(kAvatarIconWidth, kAvatarIconHeight);
-
-  // Source for a centered, sized icon.
-  scoped_ptr<gfx::ImageSkiaSource> source(
-      new AvatarImageSource(
-          *image.ToImageSkia(),
-          size,
-          std::min(kAvatarIconWidth, kAvatarIconHeight),
-          AvatarImageSource::POSITION_CENTER,
-          AvatarImageSource::BORDER_NONE));
-
-  return gfx::Image(gfx::ImageSkia(source.release(), size));
+  return GetSizedAvatarIcon(image, is_rectangle,
+                            kAvatarIconWidth, kAvatarIconHeight);
 }
 
 gfx::Image GetAvatarIconForTitleBar(const gfx::Image& image,
                                     bool is_rectangle,
                                     int dst_width,
                                     int dst_height) {
   if (!is_rectangle)
     return image;
 
   int size = std::min(std::min(kAvatarIconWidth, kAvatarIconHeight),
@@ skipping 55 matching lines @@
         int_value >= static_cast<int>(kDefaultAvatarIconsCount))
       return false;
     *icon_index = int_value;
     return true;
   }
 
   return false;
 }
 
 }  // namespace profiles