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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index ca34c997e2e0eb956246d03c58ccf385fbd71644..09bfa136b899cfac4c92a59bd84495af3a8f8d33 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -145,13 +145,6 @@ void ExtensionIconSource::LoadIconFailed(int request_id) {
LoadDefaultImage(request_id);
}
-const SkBitmap* ExtensionIconSource::GetWebStoreImage() {
- if (!web_store_icon_data_.get())
- web_store_icon_data_.reset(LoadImageByResourceId(IDR_WEBSTORE_ICON));
-
- return web_store_icon_data_.get();
-}
-
const SkBitmap* ExtensionIconSource::GetDefaultAppImage() {
if (!default_app_data_.get())
default_app_data_.reset(LoadImageByResourceId(IDR_APP_DEFAULT_ICON));
@@ -184,9 +177,7 @@ void ExtensionIconSource::LoadDefaultImage(int request_id) {
ExtensionIconRequest* request = GetData(request_id);
const SkBitmap* default_image = NULL;
- if (request->extension->id() == extension_misc::kWebStoreAppId)
- default_image = GetWebStoreImage();
- else if (request->extension->is_app())
+ if (request->extension->is_app())
default_image = GetDefaultAppImage();
else
default_image = GetDefaultExtensionImage();
« 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