| 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 0119b03eab5eb9339592f9642b308d26f7f05b50..c1f58ca32396bf03eec2795694fd4033692d84b0 100644
|
| --- a/chrome/browser/ui/app_list/fast_show_pickler.cc
|
| +++ b/chrome/browser/ui/app_list/fast_show_pickler.cc
|
| @@ -18,7 +18,7 @@ using app_list::AppListModel;
|
| // should be incremented.
|
| enum ImageFormat {
|
| NONE,
|
| - A1,
|
| +// A1, // kA1_Config is DEPRECATED
|
| A8,
|
| INDEX_8,
|
| RGB_565,
|
| @@ -31,9 +31,6 @@ bool FormatToConfig(ImageFormat format, SkBitmap::Config* out) {
|
| case NONE:
|
| *out = SkBitmap::kNo_Config;
|
| break;
|
| - case A1:
|
| - *out = SkBitmap::kA1_Config;
|
| - break;
|
| case A8:
|
| *out = SkBitmap::kA8_Config;
|
| break;
|
| @@ -59,9 +56,6 @@ bool ConfigToFormat(SkBitmap::Config config, ImageFormat* out) {
|
| case SkBitmap::kNo_Config:
|
| *out = NONE;
|
| break;
|
| - case SkBitmap::kA1_Config:
|
| - *out = A1;
|
| - break;
|
| case SkBitmap::kA8_Config:
|
| *out = A8;
|
| break;
|
| @@ -198,7 +192,7 @@ void CopyOverItem(AppListItemModel* src_item, AppListItemModel* dest_item) {
|
|
|
| // 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 = 1;
|
| +const int FastShowPickler::kVersion = 2;
|
|
|
| scoped_ptr<Pickle> FastShowPickler::PickleAppListModelForFastShow(
|
| AppListModel* model) {
|
|
|