From d9ad80fce90880db9b63f59206ba106d203a4976 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Tue, 30 Mar 2010 20:40:18 +0000 Subject: Attempt 2 at landing this. Patch is exactly same as last time around. Adds ability for ImageLoadingTracker to cache images. BUG=none TEST=none TBR=aa@chromium.org Review URL: http://codereview.chromium.org/1534006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43130 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/browser_actions_toolbar_gtk.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chrome/browser/gtk/browser_actions_toolbar_gtk.cc') diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index 5870929..977bd2f 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -91,9 +91,10 @@ 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_->GetResource(path), - gfx::Size(Extension::kBrowserActionIconMaxSize, - Extension::kBrowserActionIconMaxSize)); + tracker_.LoadImage(extension_, extension_->GetResource(path), + gfx::Size(Extension::kBrowserActionIconMaxSize, + Extension::kBrowserActionIconMaxSize), + ImageLoadingTracker::DONT_CACHE); } g_signal_connect(button_.get(), "button-press-event", -- cgit v1.1