ESC accelerator and consistent overview mode for Athena homecard

athena/home/home_card_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/home/home_card_impl.h"
 
 #include <cmath>
 #include <limits>
 
 #include "athena/env/public/athena_env.h"
@@ skipping 179 matching lines @@
           gesture_delegate_,
           GetWidget()->GetNativeWindow()->GetRootWindow()->bounds()));
     }
 
     if (gesture_manager_)
       gesture_manager_->ProcessGestureEvent(event);
   }
   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;
   }
 
  private:
   void UpdateShadow(bool should_show) {
     wm::SetShadowType(
         GetWidget()->GetNativeWindow(),
         should_show ? wm::SHADOW_TYPE_RECTANGULAR : wm::SHADOW_TYPE_NONE);
@@ skipping 149 matching lines @@
 }
 
 bool HomeCardImpl::IsCommandEnabled(int command_id) const {
   return true;
 }
 
 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;
 }
 
 void HomeCardImpl::OnGestureEnded(State final_state, bool is_fling) {
   home_card_view_->ClearGesture();
   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
     // slow-down right after the finger release because of slow-in. Therefore
     // EASE_OUT is better.
     gfx::Tween::Type tween_type =
         is_fling ? gfx::Tween::EASE_OUT : gfx::Tween::EASE_IN_OUT;
     home_card_view_->SetStateWithAnimation(state_, tween_type);
     layout_manager_->Layout(true, tween_type);
   }
@@ skipping 57 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena