summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/browser_actions_container.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 22:27:26 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 22:27:26 +0000
commit1414de82ef8592ced38d6424e9e763877a90e25a (patch)
tree1585de037378a993048490703aae74a69544a8bc /chrome/browser/views/browser_actions_container.cc
parenta92423f495b2d72707212a000953ccb6080b0f0d (diff)
downloadchromium_src-1414de82ef8592ced38d6424e9e763877a90e25a.zip
chromium_src-1414de82ef8592ced38d6424e9e763877a90e25a.tar.gz
chromium_src-1414de82ef8592ced38d6424e9e763877a90e25a.tar.bz2
Adds ability for ImageLoadingTracker to cache images.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1251011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/browser_actions_container.cc')
-rw-r--r--chrome/browser/views/browser_actions_container.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index 7ccaee8..6c8aaa0 100644
--- a/chrome/browser/views/browser_actions_container.cc
+++ b/chrome/browser/views/browser_actions_container.cc
@@ -120,9 +120,10 @@ BrowserActionButton::BrowserActionButton(Extension* extension,
// will crash. But since we know that ImageLoadingTracker is asynchronous,
// this should be OK. And doing this in the constructor means that we don't
// have to protect against it getting done multiple times.
- tracker_.LoadImage(extension->GetResource(relative_path),
+ tracker_.LoadImage(extension, extension->GetResource(relative_path),
gfx::Size(Extension::kBrowserActionIconMaxSize,
- Extension::kBrowserActionIconMaxSize));
+ Extension::kBrowserActionIconMaxSize),
+ ImageLoadingTracker::DONT_CACHE);
}
void BrowserActionButton::Destroy() {