[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 90 matching lines @@
   InitLayout();
 }
 
 int DefaultImagesView::GetDefaultImageIndex() const {
   if (selected_image_index_ == -1)
     return -1;
   else
     return selected_image_index_ - 1;
 }
 
+void DefaultImagesView::SetDefaultImageIndex(int image_index) {
+  selected_image_index_ = image_index + 1;

[Nikita (slow), 2011/05/16 16:45:16]

nit: Please comment that we're skipping camera image.

[whywhat, 2011/05/17 12:25:43]

Done.
I introduced a named constant and put a comment near it.

+  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;
   size_t image_count = default_images_.size();
   int rows_count = (image_count + kColumnsCount - 1) / kColumnsCount;
@@ skipping 13 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