Cleanup home card shadow code.

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/common/container_priorities.h"
@@ skipping 147 matching lines @@
                         float progress) {
     // TODO(mukai): not clear the focus, but simply close the virtual keyboard.
     if (from_state != HomeCard::VISIBLE_CENTERED ||
         to_state != HomeCard::VISIBLE_CENTERED) {
       GetFocusManager()->ClearFocus();
     }
     if (from_state == HomeCard::VISIBLE_CENTERED)
       main_view_->SetLayoutState(1.0f - progress);
     else if (to_state == HomeCard::VISIBLE_CENTERED)
       main_view_->SetLayoutState(progress);
-    else
-      SetState(to_state);
+    UpdateShadow(true);
   }
 
-  void SetState(HomeCard::State state) {
+  void SetStateWithAnimation(HomeCard::State state) {
+    UpdateShadow(state != HomeCard::VISIBLE_MINIMIZED);
     if (state == HomeCard::VISIBLE_CENTERED)
       main_view_->RequestFocusOnSearchBox();
     else
-      GetWidget()->GetFocusManager()->ClearFocus();
-    wm::SetShadowType(GetWidget()->GetNativeView(),
-                      state == HomeCard::VISIBLE_MINIMIZED ?
-                      wm::SHADOW_TYPE_NONE :
-                      wm::SHADOW_TYPE_RECTANGULAR);
-    main_view_->SetLayoutState(
-        (state == HomeCard::VISIBLE_CENTERED) ? 1.0f : 0.0f);
-  }
-
-  void SetStateWithAnimation(HomeCard::State state) {
-    if (state == HomeCard::VISIBLE_CENTERED)
-      main_view_->RequestFocusOnSearchBox();
-    else
       GetWidget()->GetFocusManager()->ClearFocus();
 
     if (state == HomeCard::VISIBLE_MINIMIZED)
       return;
 
     main_view_->SetLayoutStateWithAnimation(
         (state == HomeCard::VISIBLE_CENTERED) ? 1.0f : 0.0f);
   }
 
   void ClearGesture() {
@@ skipping 15 matching lines @@
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
     if (HomeCard::Get()->GetState() == HomeCard::VISIBLE_MINIMIZED &&
         event.IsLeftMouseButton() && event.GetClickCount() == 1) {
       athena::WindowManager::GetInstance()->ToggleOverview();
       return true;
     }
     return false;
   }
 
  private:
+  void UpdateShadow(bool should_show) {
+    wm::SetShadowType(
+        GetWidget()->GetNativeWindow(),
+        should_show ? wm::SHADOW_TYPE_RECTANGULAR : wm::SHADOW_TYPE_NONE);
+  }
+
   // views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
 
   AthenaStartPageView* main_view_;
   scoped_ptr<HomeCardGestureManager> gesture_manager_;
   HomeCardGestureManager::Delegate* gesture_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardView);
@@ skipping 219 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena