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

Unified Diff: athena/home/home_card_impl.cc

Issue 635223004: Refactor SetInOverview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix error Created 6 years, 2 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 c96af41085e6b4586e2eba5341572e74ab448be9..12f973ee1f5ca53597c83007cae27ea553c318e3 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -197,7 +197,7 @@ class HomeCardView : public views::WidgetDelegateView {
virtual bool OnMousePressed(const ui::MouseEvent& event) override {
if (HomeCard::Get()->GetState() == HomeCard::VISIBLE_MINIMIZED &&
event.IsLeftMouseButton() && event.GetClickCount() == 1) {
- athena::WindowManager::Get()->ToggleOverview();
+ athena::WindowManager::Get()->EnterOverview();
return true;
}
return false;
@@ -379,7 +379,10 @@ void HomeCardImpl::OnGestureEnded(State final_state, bool is_fling) {
if (state_ != final_state &&
(state_ == VISIBLE_MINIMIZED || final_state == VISIBLE_MINIMIZED)) {
SetState(final_state);
- WindowManager::Get()->ToggleOverview();
+ if (WindowManager::Get()->IsOverviewModeActive())
+ WindowManager::Get()->ExitOverview();
+ else
+ WindowManager::Get()->EnterOverview();
} else {
state_ = final_state;
// When the animation happens after a fling, EASE_IN_OUT would cause weird
« 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