Move app list search result icon sizes to app_list_constants.

This CL is a pure refactor of app list search result icon sizes which were
previously constants scattered about the codebase. This CL puts the icon
size as a static function in SearchResult so that there is only one place
the size needs to be changed.

BUG=391348

Review URL: https://codereview.chromium.org/458983004

Cr-Commit-Position: refs/heads/master@{#289517}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289517 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 36 insertions, 13 deletions

diff --git a/ui/app_list/app_list_constants.cc b/ui/app_list/app_list_constants.cc
index 477b8e2..86edad4 100644
--- a/ui/app_list/app_list_constants.cc
+++ b/ui/app_list/app_list_constants.cc
@@ -66,6 +66,10 @@ const int kPreferredCols = 4;
 const int kPreferredRows = 4;
 const int kPreferredIconDimension = 48;
 
+// Preferred search result icon sizes.
+const int kListIconSize = 32;
+const int kTileIconSize = 48;
+
 // Preferred number of columns and rows in the experimental app list apps grid.
 const int kExperimentalPreferredCols = 6;
 const int kExperimentalPreferredRows = 3;
diff --git a/ui/app_list/app_list_constants.h b/ui/app_list/app_list_constants.h
index 4a0b060..a56849e 100644
--- a/ui/app_list/app_list_constants.h
+++ b/ui/app_list/app_list_constants.h
@@ -50,6 +50,9 @@ APP_LIST_EXPORT extern const int kPreferredCols;
 APP_LIST_EXPORT extern const int kPreferredRows;
 APP_LIST_EXPORT extern const int kPreferredIconDimension;
 
+APP_LIST_EXPORT extern const int kListIconSize;
+APP_LIST_EXPORT extern const int kTileIconSize;
+
 APP_LIST_EXPORT extern const int kExperimentalPreferredCols;
 APP_LIST_EXPORT extern const int kExperimentalPreferredRows;
 
diff --git a/ui/app_list/search_result.cc b/ui/app_list/search_result.cc
index 771251f..bfa1da9 100644
--- a/ui/app_list/search_result.cc
+++ b/ui/app_list/search_result.cc
@@ -4,6 +4,7 @@
 
 #include "ui/app_list/search_result.h"
 
+#include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/search_result_observer.h"
 
 namespace app_list {
@@ -67,6 +68,17 @@ void SearchResult::SetPercentDownloaded(int percent_downloaded) {
                     OnPercentDownloadedChanged());
 }
 
+int SearchResult::GetPreferredIconDimension() const {
+  switch (display_type_) {
+    case DISPLAY_TILE:
+      return kTileIconSize;
+    case DISPLAY_LIST:
+      return kListIconSize;
+  }
+  NOTREACHED();
+  return 0;
+}
+
 void SearchResult::NotifyItemInstalled() {
   FOR_EACH_OBSERVER(SearchResultObserver, observers_, OnItemInstalled());
 }
diff --git a/ui/app_list/search_result.h b/ui/app_list/search_result.h
index f210248..7e7524f 100644
--- a/ui/app_list/search_result.h
+++ b/ui/app_list/search_result.h
@@ -109,6 +109,9 @@ class APP_LIST_EXPORT SearchResult {
   int percent_downloaded() const { return percent_downloaded_; }
   void SetPercentDownloaded(int percent_downloaded);
 
+  // Returns the dimension at which this result's icon should be displayed.
+  int GetPreferredIconDimension() const;
+
   void NotifyItemInstalled();
   void NotifyItemUninstalled();
 
diff --git a/ui/app_list/views/search_result_view.cc b/ui/app_list/views/search_result_view.cc
index 74e3d7a..38978f5 100644
--- a/ui/app_list/views/search_result_view.cc
+++ b/ui/app_list/views/search_result_view.cc
@@ -25,15 +25,17 @@ 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,
@@ -143,8 +145,8 @@ void SearchResultView::Layout() {
     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);
 
@@ -221,16 +223,16 @@ void SearchResultView::OnPaint(gfx::Canvas* canvas) {
   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()));
@@ -279,11 +281,11 @@ void SearchResultView::OnIconChanged() {
     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();
   }
diff --git a/ui/app_list/views/tile_item_view.cc b/ui/app_list/views/tile_item_view.cc
index dcc30c3..9997fab 100644
--- a/ui/app_list/views/tile_item_view.cc
+++ b/ui/app_list/views/tile_item_view.cc
@@ -22,7 +22,6 @@ namespace {
 
 const int kTileSize = 90;
 const int kTileHorizontalPadding = 10;
-const int kTileImageSize = 48;
 
 const SkColor kTileBackgroundColor = SK_ColorWHITE;
 const int kTileColorStripHeight = 2;
@@ -85,7 +84,7 @@ TileItemView::TileItemView()
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
   SetLayoutManager(layout_manager);
 
-  icon_->SetImageSize(gfx::Size(kTileImageSize, kTileImageSize));
+  icon_->SetImageSize(gfx::Size(kTileIconSize, kTileIconSize));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   title_->SetAutoColorReadabilityEnabled(false);