Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: ui/app_list/views/app_list_item_view.cc

Issue 2329633003: Implement progress bar spec (determinate and indeterminate). (Closed)
Patch Set: attempt to unbreak mac and unit test Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/progress_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_item_view.cc
diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc
index 0aa47a0be54bd24203485832e7e02a22ed4ed6d1..643c18a3ce6d1148423f5ef23de8f402a7d474b1 100644
--- a/ui/app_list/views/app_list_item_view.cc
+++ b/ui/app_list/views/app_list_item_view.cc
@@ -14,7 +14,6 @@
#include "ui/app_list/app_list_item.h"
#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/views/apps_grid_view.h"
-#include "ui/app_list/views/progress_bar_view.h"
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -33,6 +32,7 @@
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/controls/progress_bar.h"
#include "ui/views/drag_controller.h"
namespace app_list {
@@ -78,7 +78,7 @@ AppListItemView::AppListItemView(AppsGridView* apps_grid_view,
apps_grid_view_(apps_grid_view),
icon_(new views::ImageView),
title_(new views::Label),
- progress_bar_(new ProgressBarView),
+ progress_bar_(new views::ProgressBar),
ui_state_(UI_STATE_NORMAL),
touch_dragging_(false),
shadow_animator_(this),
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/progress_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698