diff options
| author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 10:54:23 +0000 |
|---|---|---|
| committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 10:54:23 +0000 |
| commit | 31e7fba2a2feddd74c14b9c717d6e30c5d7fa1de (patch) | |
| tree | 0584bd19627fe1c5309171d510a876ac16224b00 /chrome/browser/extensions/image_loading_tracker.h | |
| parent | 771aa5c741777ce686d5d30f26d2c6658e8595fc (diff) | |
| download | chromium_src-31e7fba2a2feddd74c14b9c717d6e30c5d7fa1de.zip chromium_src-31e7fba2a2feddd74c14b9c717d6e30c5d7fa1de.tar.gz chromium_src-31e7fba2a2feddd74c14b9c717d6e30c5d7fa1de.tar.bz2 | |
Attempt to load component extension favicon from the resources first.
Special handling of CWS icon.
Also correctly handle URL rewrites in favicon requests.
BUG=chromium-os:28314,chromium:120471
TEST=Observe the right favicon for CWS and FileManager component extension. Bookmark them and see the right favicon.
Review URL: https://chromiumcodereview.appspot.com/9979001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/image_loading_tracker.h')
| -rw-r--r-- | chrome/browser/extensions/image_loading_tracker.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h index 96e6513..be89d34 100644 --- a/chrome/browser/extensions/image_loading_tracker.h +++ b/chrome/browser/extensions/image_loading_tracker.h @@ -9,6 +9,7 @@ #include <map> #include "base/compiler_specific.h" +#include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "chrome/common/extensions/extension_resource.h" #include "content/public/browser/notification_observer.h" @@ -122,6 +123,13 @@ class ImageLoadingTracker : public content::NotificationObserver { void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource, const gfx::Size& original_size, int id, bool should_cache); + // Checks whether image is a component extension resource. Returns false + // if a given |resource| does not have a corresponding image in bundled + // resources. Otherwise fills |resource_id|. + bool IsComponentExtensionResource(const Extension* extension, + const ExtensionResource& resource, + int& resource_id) const; + // content::NotificationObserver method. If an extension is uninstalled while // we're waiting for the image we remove the entry from load_map_. virtual void Observe(int type, @@ -143,6 +151,9 @@ class ImageLoadingTracker : public content::NotificationObserver { content::NotificationRegistrar registrar_; + FRIEND_TEST_ALL_PREFIXES(ImageLoadingTrackerTest, + IsComponentExtensionResource); + DISALLOW_COPY_AND_ASSIGN(ImageLoadingTracker); }; |