[cros] Update default avatars and guest icon

chrome/browser/chromeos/login/default_images_view.cc

 // Copyright (c) 2011 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/chromeos/login/default_images_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
@@ skipping 28 matching lines @@
 const int kImageBorderSize = 1;
 // Color of default image border.
 const SkColor kImageBorderColor = SkColorSetARGB(38, 0, 0, 0);
 // Color of default image background.
 const SkColor kImageBackgroundColor = SK_ColorWHITE;
 // We give each image control an ID so we could distinguish them. Since 0 is
 // the default ID we want an offset for IDs we set.
 const int kImageStartId = 100;
 // ID for image control for video capture.
 const int kCaptureButtonId = 1000;
+// A number of the first buttons that don't correspond to any default image
+// (i.e. button to take a photo).
+const int kNonDefaultImageButtonsCount = 1;
 
 }  // namespace
 
 // Image button with border and background. Corrects view size by border
 // insets as ImageButton ignores it.
 class UserImageButton : public views::ImageButton {
  public:
   explicit UserImageButton(views::ButtonListener* listener);
 
   // Overridden from views::View:
@@ skipping 39 matching lines @@
     InitButton(kDefaultImageResources[i], image_button);
     default_images_.push_back(image_button);
   }
   InitLayout();
 }
 
 int DefaultImagesView::GetDefaultImageIndex() const {
   if (selected_image_index_ == -1)
     return -1;
   else
-    return selected_image_index_ - 1;
+    return selected_image_index_ - kNonDefaultImageButtonsCount;
+}
+
+void DefaultImagesView::SetDefaultImageIndex(int image_index) {
+  selected_image_index_ = image_index + kNonDefaultImageButtonsCount;
+  if (delegate_)
+    delegate_->OnImageSelected(image_index % kDefaultImagesCount);
 }
 
 void DefaultImagesView::ClearSelection() {
   selected_image_index_ = -1;
 }
 
 gfx::Size DefaultImagesView::GetPreferredSize() {
   int image_size_with_margin = (kDefaultImageSize + 2 * kImageBorderSize);
   int width = kColumnsCount * image_size_with_margin +
               (kColumnsCount - 1) * kHorizontalPadding;
@@ skipping 15 matching lines @@
   if (sender->GetID() == kCaptureButtonId) {
     if (delegate_)
       delegate_->OnCaptureButtonClicked();
   } else {
     int image_index = sender->GetID() - kImageStartId;
     int images_count = static_cast<int>(default_images_.size());
     if (image_index < 0 || image_index >= images_count) {
       NOTREACHED() << "Got ButtonPressed event from a view with wrong id.";
       return;
     }
-    selected_image_index_ = image_index + 1;
-    if (delegate_)
-      delegate_->OnImageSelected(image_index % kDefaultImagesCount);
+    SetDefaultImageIndex(image_index);
   }
 }
 
 void DefaultImagesView::InitButton(int resource_id,
                                    UserImageButton* button) const {
   const SkBitmap* original_image =
       ResourceBundle::GetSharedInstance().GetBitmapNamed(resource_id);
   SkBitmap resized_image = skia::ImageOperations::Resize(
       *original_image,
       skia::ImageOperations::RESIZE_BEST,
@@ skipping 46 matching lines @@
     for (int column = 0; column < kColumnsCount; ++column) {
       if (current_image >= image_count)
         break;
       layout->AddView(default_images_[current_image]);
       ++current_image;
     }
   }
 }
 
 }  // namespace chromeos