ESC accelerator and consistent overview mode for Athena homecard

athena/home/home_card_impl.cc

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..438bf4152062648dbd5511ffb5fb598fd60c3e31 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()->ActivateOverview(false);
       return true;
     }
     return false;
@@ -367,10 +367,13 @@ bool HomeCardImpl::OnAcceleratorFired(int command_id,
                                       const ui::Accelerator& accelerator) {
   DCHECK_EQ(COMMAND_SHOW_HOME_CARD, command_id);
 
-  if (state_ == VISIBLE_CENTERED && original_state_ != VISIBLE_BOTTOM)
+  if (state_ == VISIBLE_CENTERED && original_state_ != VISIBLE_BOTTOM) {
     SetState(VISIBLE_MINIMIZED);
-  else if (state_ == VISIBLE_MINIMIZED)
+    WindowManager::Get()->ActivateOverview(false);
+  } else if (state_ == VISIBLE_MINIMIZED) {
     SetState(VISIBLE_CENTERED);
+    WindowManager::Get()->ActivateOverview(true);
+  }
   return true;
 }
 
@@ -379,7 +382,8 @@ 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();
+    WindowManager::Get()->ActivateOverview(
+        !WindowManager::Get()->IsOverviewModeActive());
   } else {
     state_ = final_state;
     // When the animation happens after a fling, EASE_IN_OUT would cause weird