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

Unified Diff: athena/home/home_card_impl.cc

Issue 503113002: Allows directly entering to VISIBLE_CENTERED state from gesture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years, 4 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/home/home_card_unittest.cc » ('j') | no next file with comments »
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 7b73bc241d21429f7f376ccfdea34e0617159554..c559594964a48036b2e1051dbe6936e6ad57ef62 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -606,6 +606,7 @@ void HomeCardImpl::OnGestureEnded(State final_state) {
home_card_view_->ClearGesture();
if (state_ != final_state &&
(state_ == VISIBLE_MINIMIZED || final_state == VISIBLE_MINIMIZED)) {
+ SetState(final_state);
WindowManager::GetInstance()->ToggleOverview();
} else {
HomeCard::State old_state = state_;
@@ -631,7 +632,8 @@ void HomeCardImpl::OnGestureProgressed(
}
void HomeCardImpl::OnOverviewModeEnter() {
- SetState(VISIBLE_BOTTOM);
+ if (state_ == VISIBLE_MINIMIZED)
+ SetState(VISIBLE_BOTTOM);
}
void HomeCardImpl::OnOverviewModeExit() {
« no previous file with comments | « no previous file | athena/home/home_card_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698