diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 22:44:35 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 22:44:35 +0000 |
| commit | 77599916d877c02275267ddccbb861f31612fa1d (patch) | |
| tree | 7beabc8495fd5cd1b02011f2c94f86adcace3a84 /chrome | |
| parent | 83ab5f200ee5c9601bfa60d1786f99c77ff1a88a (diff) | |
| download | chromium_src-77599916d877c02275267ddccbb861f31612fa1d.zip chromium_src-77599916d877c02275267ddccbb861f31612fa1d.tar.gz chromium_src-77599916d877c02275267ddccbb861f31612fa1d.tar.bz2 | |
Fix crash in BrowserActionButton::OnImageLoaded.
BUG=27167
Review URL: http://codereview.chromium.org/385072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/browser_actions_container.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index 561df9b..a6d29f3 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -88,6 +88,10 @@ void BrowserActionButton::LoadImage() { if (relative_path.empty()) return; + // Cancel old image trackers. We can only track one at a time. + if (tracker_) + tracker_->StopTrackingImageLoad(); + tracker_ = new ImageLoadingTracker(this, 1); tracker_->PostLoadImageTask( extension()->GetResource(relative_path), |