Make the app list use images for the progress bar.

ui/app_list/views/app_list_item_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/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
+#include "grit/theme_resources.h"
 #include "ui/app_list/app_list_item_model.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace app_list {
 
 namespace {
 
 const int kTopBottomPadding = 10;
 const int kTopPadding = 20;
 const int kIconTitleSpacing = 7;
-const int kProgressBarHorizontalPadding = 8;
+const int kProgressBarHorizontalPadding = 12;
 const int kProgressBarVerticalPadding = 4;
 const int kProgressBarHeight = 4;
 
 const SkColor kTitleColor = SkColorSetRGB(0x5A, 0x5A, 0x5A);
 const SkColor kTitleHoverColor = SkColorSetRGB(0x3C, 0x3C, 0x3C);
 
 const SkColor kHoverAndPushedColor = SkColorSetARGB(0x19, 0, 0, 0);
 const SkColor kSelectedColor = SkColorSetARGB(0x0D, 0, 0, 0);
 const SkColor kHighlightedColor = kHoverAndPushedColor;
 const SkColor kDownloadProgressBackgroundColor =
@@ skipping 125 matching lines @@
 }
 
 void AppListItemView::ItemHighlightedChanged() {
   apps_grid_view_->EnsureViewVisible(this);
   SchedulePaint();
 }
 
 void AppListItemView::ItemIsInstallingChanged() {
   if (model_->is_installing())
     apps_grid_view_->EnsureViewVisible(this);
+  title_->SetVisible(!model_->is_installing());
   SchedulePaint();
 }
 
 void AppListItemView::ItemPercentDownloadedChanged() {
   SchedulePaint();
 }
 
 std::string AppListItemView::GetClassName() const {
   return kViewClassName;
 }
@@ skipping 10 matching lines @@
   icon_bounds.Inset(gfx::ShadowValue::GetMargin(icon_shadows_));
   icon_->SetBoundsRect(icon_bounds);
 
   const gfx::Size title_size = title_->GetPreferredSize();
   gfx::Rect title_bounds(rect.x() + (rect.width() - title_size.width()) / 2,
                          y + icon_size_.height() + kIconTitleSpacing,
                          title_size.width(),
                          title_size.height());
   title_bounds.Intersect(rect);
   title_->SetBoundsRect(title_bounds);
+  title_->SetVisible(!model_->is_installing());

[xiyuan, 2013/02/12 17:38:40]

We had the logic in ItemIsInstallingChanged already. Do we still need this?

[koz (OOO until 15th September), 2013/02/13 00:09:03]

Experimentation told me I needed this here, but your comment prompted me to
investigate further. We don't actually need this here - it just needs to move to
the constructor. Layout() occurs shortly after (during?) the constructor, so
putting it here made things work, but the constructor is the right place for it.

 }
 
 void AppListItemView::OnPaint(gfx::Canvas* canvas) {
   if (apps_grid_view_->IsDraggedView(this))
     return;
 
   gfx::Rect rect(GetContentsBounds());
 
   if (model_->highlighted()) {
     canvas->FillRect(rect, kHighlightedColor);
   } else if (hover_animation_->is_animating()) {
     int alpha = SkColorGetA(kHoverAndPushedColor) *
         hover_animation_->GetCurrentValue();
     canvas->FillRect(rect, SkColorSetA(kHoverAndPushedColor, alpha));
   } else if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
     canvas->FillRect(rect, kHoverAndPushedColor);
   } else if (apps_grid_view_->IsSelectedView(this)) {
     canvas->FillRect(rect, kSelectedColor);
   }
 
   if (model_->is_installing()) {
-    gfx::Rect progress_bar_background(
-        rect.x() + kProgressBarHorizontalPadding,
-        rect.bottom() - kProgressBarVerticalPadding - kProgressBarHeight,
-        rect.width() - 2 * kProgressBarHorizontalPadding,
-        kProgressBarHeight);
-    canvas->FillRect(progress_bar_background, kDownloadProgressBackgroundColor);
+    gfx::ImageSkia background = *ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_APP_LIST_ITEM_PROGRESS_BACKGROUND);
+    gfx::ImageSkia left = *ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_APP_LIST_ITEM_PROGRESS_LEFT);
+    gfx::ImageSkia center = *ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_APP_LIST_ITEM_PROGRESS_CENTER);
+    gfx::ImageSkia right = *ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_APP_LIST_ITEM_PROGRESS_RIGHT);
 
+    int bar_x = rect.x() + kProgressBarHorizontalPadding;
+    int bar_y = icon_->bounds().bottom() + kIconTitleSpacing;
+
+    canvas->DrawImageInt(background, bar_x, bar_y);
     if (model_->percent_downloaded() != -1) {
       float percent = model_->percent_downloaded() / 100.0;
-      gfx::Rect progress_bar(
-          progress_bar_background.x(),
-          progress_bar_background.y(),
-          progress_bar_background.width() * percent,
-          progress_bar_background.height());
-      canvas->FillRect(progress_bar, kDownloadProgressColor);
+      int bar_width = percent *
+          (background.width() - (left.width() + right.width()));
+
+      canvas->DrawImageInt(left, bar_x, bar_y);
+      int x = bar_x + left.width();
+      canvas->TileImageInt(center, x, bar_y, bar_width, center.height());
+      x += bar_width;
+      canvas->DrawImageInt(right, x, bar_y);
     }
   }
 }
 
 void AppListItemView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = UTF8ToUTF16(model_->title());
 }
 
 void AppListItemView::ShowContextMenuForView(views::View* source,
@@ skipping 121 matching lines @@
         SetTouchDragging(false);
       break;
     default:
       break;
   }
   if (!event->handled())
     CustomButton::OnGestureEvent(event);
 }
 
 }  // namespace app_list