diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 05:28:24 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 05:28:24 +0000 |
| commit | 9583536656a591f7ce8fae7493ef95f5c03014f2 (patch) | |
| tree | 8b8bcdb96c5bb9021a93eb37176622d30927acbb /ash | |
| parent | 57edfdad6cd742450214afd0484ade47012279ad (diff) | |
| download | chromium_src-9583536656a591f7ce8fae7493ef95f5c03014f2.zip chromium_src-9583536656a591f7ce8fae7493ef95f5c03014f2.tar.gz chromium_src-9583536656a591f7ce8fae7493ef95f5c03014f2.tar.bz2 | |
aura: Fix applist crash on 2nd show.
r120147 accidentally removed widget observer instead of the animation observer.
BUG=112654
TEST=Verify fix for issue 112654.
Review URL: http://codereview.chromium.org/9331007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/app_list/app_list.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/app_list/app_list.cc b/ash/app_list/app_list.cc index ad9fd01..d9e30d1 100644 --- a/ash/app_list/app_list.cc +++ b/ash/app_list/app_list.cc @@ -87,7 +87,7 @@ void AppList::SetWidget(views::Widget* widget) { if (is_visible_) { widget_ = widget; - GetLayer(widget_)->GetAnimator()->AddObserver(this); + widget_->AddObserver(this); Shell::GetInstance()->AddRootWindowEventFilter(this); widget_->SetBounds(GetPreferredBounds(false)); |