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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_icon_source.cc

Issue 9949012: Show CWS and FileManager icons in pinned apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: undo previous patchset Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 5 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/ref_counted_memory.h" 9 #include "base/memory/ref_counted_memory.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ExtensionIconRequest* request = GetData(request_id); 138 ExtensionIconRequest* request = GetData(request_id);
139 ExtensionResource icon = 139 ExtensionResource icon =
140 request->extension->GetIconResource(request->size, request->match); 140 request->extension->GetIconResource(request->size, request->match);
141 141
142 if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY) 142 if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY)
143 LoadFaviconImage(request_id); 143 LoadFaviconImage(request_id);
144 else 144 else
145 LoadDefaultImage(request_id); 145 LoadDefaultImage(request_id);
146 } 146 }
147 147
148 const SkBitmap* ExtensionIconSource::GetWebStoreImage() {
149 if (!web_store_icon_data_.get())
150 web_store_icon_data_.reset(LoadImageByResourceId(IDR_WEBSTORE_ICON));
151
152 return web_store_icon_data_.get();
153 }
154
155 const SkBitmap* ExtensionIconSource::GetDefaultAppImage() { 148 const SkBitmap* ExtensionIconSource::GetDefaultAppImage() {
156 if (!default_app_data_.get()) 149 if (!default_app_data_.get())
157 default_app_data_.reset(LoadImageByResourceId(IDR_APP_DEFAULT_ICON)); 150 default_app_data_.reset(LoadImageByResourceId(IDR_APP_DEFAULT_ICON));
158 151
159 return default_app_data_.get(); 152 return default_app_data_.get();
160 } 153 }
161 154
162 const SkBitmap* ExtensionIconSource::GetDefaultExtensionImage() { 155 const SkBitmap* ExtensionIconSource::GetDefaultExtensionImage() {
163 if (!default_extension_data_.get()) { 156 if (!default_extension_data_.get()) {
164 default_extension_data_.reset( 157 default_extension_data_.reset(
(...skipping 12 matching lines...) Expand all
177 bitmap = *image; 170 bitmap = *image;
178 171
179 ClearData(request_id); 172 ClearData(request_id);
180 SendResponse(request_id, BitmapToMemory(&bitmap)); 173 SendResponse(request_id, BitmapToMemory(&bitmap));
181 } 174 }
182 175
183 void ExtensionIconSource::LoadDefaultImage(int request_id) { 176 void ExtensionIconSource::LoadDefaultImage(int request_id) {
184 ExtensionIconRequest* request = GetData(request_id); 177 ExtensionIconRequest* request = GetData(request_id);
185 const SkBitmap* default_image = NULL; 178 const SkBitmap* default_image = NULL;
186 179
187 if (request->extension->id() == extension_misc::kWebStoreAppId) 180 if (request->extension->is_app())
188 default_image = GetWebStoreImage();
189 else if (request->extension->is_app())
190 default_image = GetDefaultAppImage(); 181 default_image = GetDefaultAppImage();
191 else 182 else
192 default_image = GetDefaultExtensionImage(); 183 default_image = GetDefaultExtensionImage();
193 184
194 SkBitmap resized_image(skia::ImageOperations::Resize( 185 SkBitmap resized_image(skia::ImageOperations::Resize(
195 *default_image, skia::ImageOperations::RESIZE_LANCZOS3, 186 *default_image, skia::ImageOperations::RESIZE_LANCZOS3,
196 request->size, request->size)); 187 request->size, request->size));
197 188
198 // There are cases where Resize returns an empty bitmap, for example if you 189 // There are cases where Resize returns an empty bitmap, for example if you
199 // ask for an image too large. In this case it is better to return the default 190 // ask for an image too large. In this case it is better to return the default
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 351
361 void ExtensionIconSource::ClearData(int request_id) { 352 void ExtensionIconSource::ClearData(int request_id) {
362 std::map<int, ExtensionIconRequest*>::iterator i = 353 std::map<int, ExtensionIconRequest*>::iterator i =
363 request_map_.find(request_id); 354 request_map_.find(request_id);
364 if (i == request_map_.end()) 355 if (i == request_map_.end())
365 return; 356 return;
366 357
367 delete i->second; 358 delete i->second;
368 request_map_.erase(i); 359 request_map_.erase(i);
369 } 360 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_icon_source.h ('k') | chrome/common/extensions/extension_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698