summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 22:47:57 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 22:47:57 +0000
commit8519b3024db0eb1a78fa06cb7aef2fefb89d8aef (patch)
treeb943f126ab0fa52fc753153eddc5b0035f4d486a /chrome/browser/gtk/browser_actions_toolbar_gtk.cc
parentbdf4206fe44fe56f1430d5c7d4d64abf3377b964 (diff)
downloadchromium_src-8519b3024db0eb1a78fa06cb7aef2fefb89d8aef.zip
chromium_src-8519b3024db0eb1a78fa06cb7aef2fefb89d8aef.tar.gz
chromium_src-8519b3024db0eb1a78fa06cb7aef2fefb89d8aef.tar.bz2
Revert 43005 - Adds ability for ImageLoadingTracker to cache images.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1251011 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/1526003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_actions_toolbar_gtk.cc')
-rw-r--r--chrome/browser/gtk/browser_actions_toolbar_gtk.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
index d680251..d177fab 100644
--- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
@@ -91,10 +91,9 @@ class BrowserActionButton : public NotificationObserver,
// changed at runtime, so we can load this now and cache it.
std::string path = extension_->browser_action()->default_icon_path();
if (!path.empty()) {
- tracker_.LoadImage(extension_, extension_->GetResource(path),
- gfx::Size(Extension::kBrowserActionIconMaxSize,
- Extension::kBrowserActionIconMaxSize),
- ImageLoadingTracker::DONT_CACHE);
+ tracker_.LoadImage(extension_->GetResource(path),
+ gfx::Size(Extension::kBrowserActionIconMaxSize,
+ Extension::kBrowserActionIconMaxSize));
}
g_signal_connect(button_.get(), "button-press-event",