Allows directly entering to VISIBLE_CENTERED state from gesture.

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/public/home_card.h"
 
 #include <cmath>
 #include <limits>
 
 #include "athena/common/container_priorities.h"
 #include "athena/home/app_list_view_delegate.h"
 #include "athena/home/athena_start_page_view.h"
 #include "athena/home/minimized_home.h"
 #include "athena/home/public/app_model_builder.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/public/window_manager.h"
 #include "athena/wm/public/window_manager_observer.h"
+#include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/app_list/search_provider.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/closure_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/background.h"
@@ skipping 416 matching lines @@
                                  aura::Window* lost_active) OVERRIDE;
 
   scoped_ptr<AppModelBuilder> model_builder_;
 
   HomeCard::State state_;
 
   // original_state_ is the state which the home card should go back to after
   // the virtual keyboard is hidden.
   HomeCard::State original_state_;
 
+  // The state to be entered when the overview mode is turned on.
+  HomeCard::State overview_mode_state_;
+
   views::Widget* home_card_widget_;
   HomeCardView* home_card_view_;
   scoped_ptr<AppListViewDelegate> view_delegate_;
   HomeCardLayoutManager* layout_manager_;
   aura::client::ActivationClient* activation_client_;  // Not owned
 
   // Right now HomeCard allows only one search provider.
   // TODO(mukai): port app-list's SearchController and Mixer.
   scoped_ptr<app_list::SearchProvider> search_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardImpl);
 };
 
 HomeCardImpl::HomeCardImpl(AppModelBuilder* model_builder)
     : model_builder_(model_builder),
       state_(HIDDEN),
       original_state_(VISIBLE_MINIMIZED),
+      overview_mode_state_(VISIBLE_BOTTOM),
       home_card_widget_(NULL),
       home_card_view_(NULL),
       layout_manager_(NULL),
       activation_client_(NULL) {
   DCHECK(!instance);
   instance = this;
   WindowManager::GetInstance()->AddObserver(this);
 }
 
 HomeCardImpl::~HomeCardImpl() {
@@ skipping 115 matching lines @@
 
 aura::Window* HomeCardImpl::GetNativeWindow() {
   if (state_ == HIDDEN)
     return NULL;
 
   return home_card_widget_ ? home_card_widget_->GetNativeWindow() : NULL;
 }
 
 void HomeCardImpl::OnGestureEnded(State final_state) {
   home_card_view_->ClearGesture();
   if (state_ != final_state &&

[oshima, 2014/08/25 20:47:10]

can exit early if skip if state_ == final_state?

[Jun Mukai, 2014/08/25 21:09:05]

That will cause a test failure. Also, the home card has to be laid out by
|layout_manager_| even in that case, because:
- state visible-centered
- slightly swipe down
- release the finger
then the home card has to be repositioned to the full-screen, which is done by
Layout().

[oshima, 2014/08/25 21:20:25]

Acknowledged.

       (state_ == VISIBLE_MINIMIZED || final_state == VISIBLE_MINIMIZED)) {
+    base::AutoReset<HomeCard::State> overview_mode(
+        &overview_mode_state_, final_state);
     WindowManager::GetInstance()->ToggleOverview();
   } else {
     HomeCard::State old_state = state_;
     state_ = final_state;
     home_card_view_->SetStateWithAnimation(old_state, final_state);
     layout_manager_->Layout();
   }
 }
 
 void HomeCardImpl::OnGestureProgressed(
     State from_state, State to_state, float progress) {
   home_card_view_->SetStateProgress(from_state, to_state, progress);
 
   gfx::Rect screen_bounds =
       home_card_widget_->GetNativeWindow()->GetRootWindow()->bounds();
   home_card_widget_->SetBounds(gfx::Tween::RectValueBetween(
       progress,
       GetBoundsForState(screen_bounds, from_state),
       GetBoundsForState(screen_bounds, to_state)));
 
   // TODO(mukai): signals the update to the window manager so that it shows the
   // intermediate visual state of overview mode.
 }
 
 void HomeCardImpl::OnOverviewModeEnter() {
-  SetState(VISIBLE_BOTTOM);
+  SetState(overview_mode_state_);
 }
 
 void HomeCardImpl::OnOverviewModeExit() {
   SetState(VISIBLE_MINIMIZED);
 }
 
 void HomeCardImpl::OnWindowActivated(aura::Window* gained_active,
                                      aura::Window* lost_active) {
   if (state_ != HIDDEN &&
       gained_active != home_card_widget_->GetNativeWindow()) {
@@ skipping 17 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena