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

Unified Diff: chrome/browser/ui/app_list/fast_show_pickler.cc

Issue 1154323002: Use app list item shadow for app list folders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_arrow_keys_crash
Patch Set: fix mac compile Created 5 years, 6 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: chrome/browser/ui/app_list/fast_show_pickler.cc
diff --git a/chrome/browser/ui/app_list/fast_show_pickler.cc b/chrome/browser/ui/app_list/fast_show_pickler.cc
index 8221926b123adbf0bcf8b7ad973ebdd8fa56fbf7..b06d924d0db7cf9cd1fdddceebdf1ab019925d3e 100644
--- a/chrome/browser/ui/app_list/fast_show_pickler.cc
+++ b/chrome/browser/ui/app_list/fast_show_pickler.cc
@@ -159,13 +159,10 @@ scoped_ptr<AppListItem> FastShowPickler::UnpickleAppListItem(
if (!it->ReadString(&short_name))
return scoped_ptr<AppListItem>();
result->SetNameAndShortName(name, short_name);
- bool has_shadow = false;
- if (!it->ReadBool(&has_shadow))
- return scoped_ptr<AppListItem>();
gfx::ImageSkia icon;
if (!UnpickleImage(it, &icon))
return scoped_ptr<AppListItem>();
- result->SetIcon(icon, has_shadow);
+ result->SetIcon(icon);
return result.Pass();
}
@@ -176,8 +173,6 @@ bool FastShowPickler::PickleAppListItem(Pickle* pickle, AppListItem* item) {
return false;
if (!pickle->WriteString(item->short_name()))
return false;
- if (!pickle->WriteBool(item->has_shadow()))
- return false;
if (!PickleImage(pickle, item->icon()))
return false;
return true;
@@ -186,13 +181,13 @@ bool FastShowPickler::PickleAppListItem(Pickle* pickle, AppListItem* item) {
void FastShowPickler::CopyOverItem(AppListItem* src_item,
AppListItem* dest_item) {
dest_item->SetNameAndShortName(src_item->name(), src_item->short_name());
- dest_item->SetIcon(src_item->icon(), src_item->has_shadow());
+ dest_item->SetIcon(src_item->icon());
// Do not set folder_id, pass that to AppListModel::AddItemToFolder() instead.
}
// The version of the pickle format defined here. This needs to be incremented
// whenever this format is changed so new clients can invalidate old versions.
-const int FastShowPickler::kVersion = 3;
+const int FastShowPickler::kVersion = 4;
scoped_ptr<Pickle> FastShowPickler::PickleAppListModelForFastShow(
AppListModel* model) {
« no previous file with comments | « chrome/browser/ui/app_list/extension_app_item.cc ('k') | chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698