Merge 143966 - chromeos: Make Chrome app a real app.

- Add a chrome_app component extension similar to web store;
- Remove ChromeAppItem and use the real app;
- Minor clean up;
  - use_aura -> use_ash in browser_resources.grd;
  - Fix style nits;

BUG=133015
TEST=Verify that "chrome" app is searchable.


Review URL: https://chromiumcodereview.appspot.com/10652003

TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10689050

git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144997 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 1 deletions

diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index 65d47ad..965db17 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