Move app list search result icon sizes to app_list_constants.

ui/app_list/views/search_result_view.cc

 // Copyright (c) 2012 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 "ui/app_list/views/search_result_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/search_result.h"
 #include "ui/app_list/views/progress_bar_view.h"
 #include "ui/app_list/views/search_result_actions_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPreferredWidth = 300;
 const int kPreferredHeight = 52;
-const int kIconDimension = 32;
 const int kIconPadding = 14;
-const int kIconViewWidth = kIconDimension + 2 * kIconPadding;
 const int kTextTrailPadding = kIconPadding;
 const int kBorderSize = 1;
 
 // Extra margin at the right of the rightmost action icon.
 const int kActionButtonRightMargin = 8;
 
+int GetIconViewWidth() {
+  return kListIconSize + 2 * kIconPadding;
+}
+
 // Creates a RenderText of given |text| and |styles|. Caller takes ownership
 // of returned RenderText.
 gfx::RenderText* CreateRenderText(const base::string16& text,
                                   const SearchResult::Tags& tags) {
   gfx::RenderText* render_text = gfx::RenderText::CreateInstance();
   render_text->SetText(text);
   render_text->SetColor(kResultDefaultTextColor);
 
   for (SearchResult::Tags::const_iterator it = tags.begin();
        it != tags.end();
@@ skipping 89 matching lines @@
 gfx::Size SearchResultView::GetPreferredSize() const {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 void SearchResultView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect icon_bounds(rect);
-  icon_bounds.set_width(kIconViewWidth);
-  icon_bounds.Inset(kIconPadding, (rect.height() - kIconDimension) / 2);
+  icon_bounds.set_width(GetIconViewWidth());
+  icon_bounds.Inset(kIconPadding, (rect.height() - kListIconSize) / 2);
   icon_bounds.Intersect(rect);
   icon_->SetBoundsRect(icon_bounds);
 
   const int max_actions_width =
       (rect.right() - kActionButtonRightMargin - icon_bounds.right()) / 2;
   int actions_width = std::min(max_actions_width,
                                actions_view_->GetPreferredSize().width());
 
   gfx::Rect actions_bounds(rect);
   actions_bounds.set_x(rect.right() - kActionButtonRightMargin - actions_width);
@@ skipping 56 matching lines @@
     canvas->FillRect(content_rect, kSelectedColor);
   else if (hover)
     canvas->FillRect(content_rect, kHighlightedColor);
   else
     canvas->FillRect(content_rect, kContentsBackgroundColor);
 
   gfx::Rect border_bottom = gfx::SubtractRects(rect, content_rect);
   canvas->FillRect(border_bottom, kResultBorderColor);
 
   gfx::Rect text_bounds(rect);
-  text_bounds.set_x(kIconViewWidth);
+  text_bounds.set_x(GetIconViewWidth());
   if (actions_view_->visible()) {
     text_bounds.set_width(
-        rect.width() - kIconViewWidth - kTextTrailPadding -
+        rect.width() - GetIconViewWidth() - kTextTrailPadding -
         actions_view_->bounds().width() -
         (actions_view_->has_children() ? kActionButtonRightMargin : 0));
   } else {
-    text_bounds.set_width(
-        rect.width() - kIconViewWidth - kTextTrailPadding -
-        progress_bar_->bounds().width() - kActionButtonRightMargin);
+    text_bounds.set_width(rect.width() - GetIconViewWidth() -
+                          kTextTrailPadding - progress_bar_->bounds().width() -
+                          kActionButtonRightMargin);
   }
   text_bounds.set_x(GetMirroredXWithWidthInView(text_bounds.x(),
                                                 text_bounds.width()));
 
   if (title_text_ && details_text_) {
     gfx::Size title_size(text_bounds.width(),
                          title_text_->GetStringSize().height());
     gfx::Size details_size(text_bounds.width(),
                            details_text_->GetStringSize().height());
     int total_height = title_size.height() + + details_size.height();
@@ skipping 28 matching lines @@
   gfx::ImageSkia image(result_ ? result_->icon() : gfx::ImageSkia());
   // Note this might leave the view with an old icon. But it is needed to avoid
   // flash when a SearchResult's icon is loaded asynchronously. In this case, it
   // looks nicer to keep the stale icon for a little while on screen instead of
   // clearing it out. It should work correctly as long as the SearchResult does
   // not forget to SetIcon when it's ready.
   if (image.isNull())
     return;
 
   // Scales down big icons but leave small ones unchanged.
-  if (image.width() > kIconDimension || image.height() > kIconDimension) {
+  if (image.width() > kListIconSize || image.height() > kListIconSize) {
     image = gfx::ImageSkiaOperations::CreateResizedImage(
         image,
         skia::ImageOperations::RESIZE_BEST,
-        gfx::Size(kIconDimension, kIconDimension));
+        gfx::Size(kListIconSize, kListIconSize));
   } else {
     icon_->ResetImageSize();
   }
 
   // Set the image to an empty image before we reset the image because
   // since we're using the same backing store for our images, sometimes
   // ImageView won't detect that we have a new image set due to the pixel
   // buffer pointers remaining the same despite the image changing.
   icon_->SetImage(gfx::ImageSkia());
   icon_->SetImage(image);
@@ skipping 49 matching lines @@
   if (context_menu_runner_->RunMenuAt(GetWidget(),
                                       NULL,
                                       gfx::Rect(point, gfx::Size()),
                                       views::MENU_ANCHOR_TOPLEFT,
                                       source_type) ==
       views::MenuRunner::MENU_DELETED)
     return;
 }
 
 }  // namespace app_list