diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 05:54:32 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 05:54:32 +0000 |
| commit | 8b9c0cf944f9ca3744e676b1ec72d02590f7b675 (patch) | |
| tree | 9285ce756fefd43e4fdab531d16f35800d6c1e94 /athena | |
| parent | dee939257029fa521576f8372619cf80b1786d98 (diff) | |
| download | chromium_src-8b9c0cf944f9ca3744e676b1ec72d02590f7b675.zip chromium_src-8b9c0cf944f9ca3744e676b1ec72d02590f7b675.tar.gz chromium_src-8b9c0cf944f9ca3744e676b1ec72d02590f7b675.tar.bz2 | |
Don't activate minimized/bottom home card
Home Card will be minimized when an activity is activated, so don't re-activate home card. There is also no need to activate bottom home card, so activate the centered home card only.
BUG=400575
Review URL: https://codereview.chromium.org/435293003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/home/home_card_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc index 714875a..07cf5e0 100644 --- a/athena/home/home_card_impl.cc +++ b/athena/home/home_card_impl.cc @@ -322,7 +322,10 @@ void HomeCardImpl::SetState(HomeCard::State state) { if (state_ == HIDDEN) { home_card_widget_->Hide(); } else { - home_card_widget_->Show(); + if (state_ == VISIBLE_CENTERED) + home_card_widget_->Show(); + else + home_card_widget_->ShowInactive(); home_card_view_->SetState(state); layout_manager_->Layout(); } |