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

Unified Diff: ui/app_list/test/app_list_test_model.cc

Issue 220393003: Add a unit test for resetting the app list on a reshow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trent_whole_app_list_unit_test
Patch Set: remove APP_LIST_EXPORTs Created 6 years, 7 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
Index: ui/app_list/test/app_list_test_model.cc
diff --git a/ui/app_list/test/app_list_test_model.cc b/ui/app_list/test/app_list_test_model.cc
index 66d2a6924ea83f5d173d14645dbfa928425ff185..1f8ef4264e996bd95203c0cbda477efa2ee60b70 100644
--- a/ui/app_list/test/app_list_test_model.cc
+++ b/ui/app_list/test/app_list_test_model.cc
@@ -6,6 +6,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/stringprintf.h"
+#include "grit/ui_resources.h"
+#include "ui/base/resource/resource_bundle.h"
namespace app_list {
namespace test {
@@ -20,7 +22,10 @@ AppListTestModel::AppListTestItem::AppListTestItem(
AppListTestModel* model)
: AppListItem(id),
model_(model) {
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+ SetIcon(*rb.GetImageNamed(IDR_DEFAULT_FAVICON_32).ToImageSkia(), false);
}
+
AppListTestModel::AppListTestItem::~AppListTestItem() {
}
@@ -54,7 +59,7 @@ AppListItem* AppListTestModel::AddItemToFolder(AppListItem* item,
}
void AppListTestModel::MoveItemToFolder(AppListItem* item,
- const std::string& folder_id) {
+ const std::string& folder_id) {
AppListModel::MoveItemToFolder(item, folder_id);
}

Powered by Google App Engine
This is Rietveld 408576698