diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 12:54:22 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 12:54:22 +0000 |
| commit | 86ec9981e99ee71e883d244c33de87c234ee02df (patch) | |
| tree | 2836406f67cafd19ce5e56b1d9346519c6e66899 /chrome/browser/views/browser_actions_container.h | |
| parent | 06f0bbc1ca0df7bb5c0623d63e2e01693370403a (diff) | |
| download | chromium_src-86ec9981e99ee71e883d244c33de87c234ee02df.zip chromium_src-86ec9981e99ee71e883d244c33de87c234ee02df.tar.gz chromium_src-86ec9981e99ee71e883d244c33de87c234ee02df.tar.bz2 | |
Fix crash with BrowserActionView not expecting the ImageLoadingTracker to call it back synchronously after a request to load images (when it finds a cached image).
BUG=57536
TEST=Covered by new test: BrowserActionsContainerTest.TestCrash57536
Review URL: http://codereview.chromium.org/3531014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/browser_actions_container.h')
| -rw-r--r-- | chrome/browser/views/browser_actions_container.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h index ddef35d..cd376f7 100644 --- a/chrome/browser/views/browser_actions_container.h +++ b/chrome/browser/views/browser_actions_container.h @@ -68,6 +68,9 @@ class BrowserActionButton : public views::MenuButton, // Returns the default icon, if any. const SkBitmap& default_icon() const { return default_icon_; } + // Overridden from views::View: + virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child); + // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, const views::Event& event); |