diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:40:18 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:40:18 +0000 |
| commit | d9ad80fce90880db9b63f59206ba106d203a4976 (patch) | |
| tree | 57107f54ee4db32ed51ea5116f4faef575c209ae /chrome/browser/gtk | |
| parent | 94c682ee504e8ea9e74a051e9b172468f62b1526 (diff) | |
| download | chromium_src-d9ad80fce90880db9b63f59206ba106d203a4976.zip chromium_src-d9ad80fce90880db9b63f59206ba106d203a4976.tar.gz chromium_src-d9ad80fce90880db9b63f59206ba106d203a4976.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_actions_toolbar_gtk.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 5 |
2 files changed, 7 insertions, 5 deletions
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", diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index af98cfa..9f0dcd5 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -1052,9 +1052,10 @@ LocationBarViewGtk::PageActionViewGtk::PageActionViewGtk( for (std::vector<std::string>::iterator iter = icon_paths.begin(); iter != icon_paths.end(); ++iter) { - tracker_.LoadImage(extension->GetResource(*iter), + tracker_.LoadImage(extension, extension->GetResource(*iter), gfx::Size(Extension::kPageActionIconMaxSize, - Extension::kPageActionIconMaxSize)); + Extension::kPageActionIconMaxSize), + ImageLoadingTracker::DONT_CACHE); } } |