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

Unified Diff: chrome/browser/extensions/image_loading_tracker.cc

Issue 10652003: chromeos: Make Chrome app a real app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/resources/chrome_app/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/image_loading_tracker.cc
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index 65d47ad07d59b58bde8317f3487bcb333221989c..965db178cc04803e882eaf2894692f8cab08bbbb 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -4,6 +4,9 @@
#include "chrome/browser/extensions/image_loading_tracker.h"
+#include <string>
+#include <vector>
+
#include "base/bind.h"
#include "base/file_util.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
@@ -214,12 +217,20 @@ void ImageLoadingTracker::LoadImages(const Extension* extension,
for (std::vector<ImageInfo>::const_iterator it = info_list.begin();
it != info_list.end(); ++it) {
- // Load resources for WebStore component extension.
+ // Load resources for special component extensions.
if (load_info.extension_id == extension_misc::kWebStoreAppId) {
if (!loader_)
loader_ = new ImageLoader(this);
loader_->LoadResource(it->resource, it->max_size, id, IDR_WEBSTORE_ICON);
continue;
+ } else if (load_info.extension_id == extension_misc::kChromeAppId) {
+ if (!loader_)
+ loader_ = new ImageLoader(this);
+ loader_->LoadResource(it->resource,
+ it->max_size,
+ id,
+ IDR_PRODUCT_LOGO_128);
+ continue;
}
// If we don't have a path we don't need to do any further work, just
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/resources/chrome_app/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698