Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(592)

Unified Diff: athena/home/home_card_impl.cc

Issue 546123002: Ensure that an activity is activated when overview mode is exited (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | athena/wm/split_view_controller.cc » ('j') | athena/wm/window_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/home_card_impl.cc
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
index 8c0336f7eb80f5bd058830176eb87df20b1d1b41..f6bbb033aa20cef84e7788a27cf72f9c499ee27e 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -327,10 +327,10 @@ void HomeCardImpl::SetState(HomeCard::State state) {
if (state_ == HIDDEN) {
home_card_widget_->Hide();
} else {
- if (state_ == VISIBLE_CENTERED)
- home_card_widget_->Show();
- else
+ if (state_ == VISIBLE_MINIMIZED)
home_card_widget_->ShowInactive();
+ else
+ home_card_widget_->Show();
home_card_view_->SetStateWithAnimation(state);
layout_manager_->Layout(true);
}
« no previous file with comments | « no previous file | athena/wm/split_view_controller.cc » ('j') | athena/wm/window_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698