Revert 263262 "Newly created profiles should have the grey silho..."

trunk/src/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 159 matching lines @@
     paint.setColor(highlight_color);
     canvas->DrawPath(path, paint);
   }
 }
 
 }  // namespace
 
 namespace profiles {
 
 const int kAvatarIconWidth = 38;
-const int kAvatarIconHeight = 38;
+const int kAvatarIconHeight = 31;
 const int kAvatarIconPadding = 2;
 const SkColor kAvatarTutorialBackgroundColor = SkColorSetRGB(0x42, 0x85, 0xf4);
 const SkColor kAvatarTutorialContentTextColor = SkColorSetRGB(0xc6, 0xda, 0xfc);
 
 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,
@@ skipping 15 matching lines @@
   IDR_PROFILE_AVATAR_16,
   IDR_PROFILE_AVATAR_17,
   IDR_PROFILE_AVATAR_18,
   IDR_PROFILE_AVATAR_19,
   IDR_PROFILE_AVATAR_20,
   IDR_PROFILE_AVATAR_21,
   IDR_PROFILE_AVATAR_22,
   IDR_PROFILE_AVATAR_23,
   IDR_PROFILE_AVATAR_24,
   IDR_PROFILE_AVATAR_25,
-  IDR_PROFILE_AVATAR_26,
 };
 
-// This avatar does not exist on the server, the high res copy is in the build.
-const char* kNoHighResAvatar = "NothingToDownload";
-
 // File names for the high-res avatar icon resources. In the same order as
 // the avatars in kDefaultAvatarIconResources.
 const char* kDefaultAvatarIconResourceFileNames[] = {
   "avatar_generic.png",
   "avatar_generic_aqua.png",
   "avatar_generic_blue.png",
   "avatar_generic_green.png",
   "avatar_generic_orange.png",
   "avatar_generic_purple.png",
   "avatar_generic_red.png",
   "avatar_generic_yellow.png",
   "avatar_secret_agent.png",
   "avatar_superhero.png",
   "avatar_volley_ball.png",
   "avatar_businessman.png",
   "avatar_ninja.png",
   "avatar_alien.png",
   "avatar_smiley.png",
   "avatar_flower.png",
   "avatar_pizza.png",
   "avatar_soccer.png",
   "avatar_burger.png",
   "avatar_cat.png",
   "avatar_cupcake.png",
   "avatar_dog.png",
   "avatar_horse.png",
   "avatar_margarita.png",
   "avatar_note.png",
   "avatar_sun_cloud.png",
-  kNoHighResAvatar,
 };
 
 const size_t kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources);
 
 // The first 8 icons are generic.
 const size_t kGenericAvatarIconsCount = 8;
 
-// The avatar used as a placeholder (grey silhouette).
-const int kPlaceholderAvatarIcon = 26;
-
 gfx::Image GetSizedAvatarIconWithBorder(const gfx::Image& image,
-                                        bool is_gaia_image,
+                                        bool is_rectangle,
                                         int width, int height) {
-  // The image requires no border or resizing.
-  if (!is_gaia_image && image.Height() <= height)
+  if (!is_rectangle)
     return image;
 
   gfx::Size size(width, height);
 
-  // Source for a centered, sized icon.
-  // GAIA images get a border.
+  // 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,
-          is_gaia_image ? AvatarImageSource::BORDER_NORMAL :
-              AvatarImageSource::BORDER_NONE));
+          AvatarImageSource::BORDER_NORMAL));
 
   return gfx::Image(gfx::ImageSkia(source.release(), size));
 }
 
 gfx::Image GetAvatarIconForMenu(const gfx::Image& image,
-                                bool is_gaia_image) {
+                                bool is_rectangle) {
   return GetSizedAvatarIconWithBorder(
-      image, is_gaia_image, kAvatarIconWidth, kAvatarIconHeight);
+      image, is_rectangle, kAvatarIconWidth, kAvatarIconHeight);
 }
 
 gfx::Image GetAvatarIconForWebUI(const gfx::Image& image,
-                                 bool is_gaia_image) {
-  // The image requires no border or resizing.
-  if (!is_gaia_image && image.Height() <= kAvatarIconHeight)
+                                 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));
 }
 
 gfx::Image GetAvatarIconForTitleBar(const gfx::Image& image,
-                                    bool is_gaia_image,
+                                    bool is_rectangle,
                                     int dst_width,
                                     int dst_height) {
-  // The image requires no border or resizing.
-  if (!is_gaia_image && image.Height() <= kAvatarIconHeight)
+  if (!is_rectangle)
     return image;
 
   int size = std::min(std::min(kAvatarIconWidth, kAvatarIconHeight),
                       std::min(dst_width, dst_height));
   gfx::Size dst_size(dst_width, dst_height);
 
   // Source for a sized icon drawn at the bottom center of the canvas,
-  // with an etched border (for GAIA images).
+  // with an etched border.
   scoped_ptr<gfx::ImageSkiaSource> source(
       new AvatarImageSource(
           *image.ToImageSkia(),
           dst_size,
           size,
           AvatarImageSource::POSITION_BOTTOM_CENTER,
-          is_gaia_image ? AvatarImageSource::BORDER_ETCHED :
-              AvatarImageSource::BORDER_NONE));
+          AvatarImageSource::BORDER_ETCHED));
 
   return gfx::Image(gfx::ImageSkia(source.release(), dst_size));
 }
 
 // Helper methods for accessing, transforming and drawing avatar icons.
 size_t GetDefaultAvatarIconCount() {
   return kDefaultAvatarIconsCount;
 }
 
 size_t GetGenericAvatarIconCount() {
   return kGenericAvatarIconsCount;
 }
 
-int GetPlaceholderAvatarIndex() {
-  return kPlaceholderAvatarIcon;
-}
-
-int GetPlaceholderAvatarIconResourceID() {
-  return IDR_PROFILE_AVATAR_26;
-}
-
 int GetDefaultAvatarIconResourceIDAtIndex(size_t index) {
   DCHECK(IsDefaultAvatarIconIndex(index));
   return kDefaultAvatarIconResources[index];
 }
 
 const char* GetDefaultAvatarIconFileNameAtIndex(size_t index) {
   return kDefaultAvatarIconResourceFileNames[index];
 }
 
-const char* GetNoHighResAvatarFileName() {
-  return kNoHighResAvatar;
-}
-
 std::string GetDefaultAvatarIconUrl(size_t index) {
   DCHECK(IsDefaultAvatarIconIndex(index));
   return base::StringPrintf("%s%" PRIuS, kDefaultUrlPrefix, index);
 }
 
 bool IsDefaultAvatarIconIndex(size_t index) {
   return index < kDefaultAvatarIconsCount;
 }
 
 bool IsDefaultAvatarIconUrl(const std::string& url,
@@ skipping 11 matching lines @@
         int_value >= static_cast<int>(kDefaultAvatarIconsCount))
       return false;
     *icon_index = int_value;
     return true;
   }
 
   return false;
 }
 
 }  // namespace profiles