Use ShadowController instead of creating its own.

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/bottom_home_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/bind.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/views/background.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "ui/wm/core/shadow.h"
+#include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace athena {
 namespace {
 
 HomeCard* instance = NULL;
 
@@ skipping 244 matching lines @@
 
   void SetState(HomeCard::State state) {
     bottom_view_->SetVisible(state == HomeCard::VISIBLE_BOTTOM);
     main_view_->SetVisible(state == HomeCard::VISIBLE_CENTERED);
     minimized_view_->SetVisible(state == HomeCard::VISIBLE_MINIMIZED);
     if (state == HomeCard::VISIBLE_CENTERED) {
       app_list::ContentsView* contents_view = main_view_->contents_view();
       contents_view->SetActivePage(contents_view->GetPageIndexForNamedPage(
           app_list::ContentsView::NAMED_PAGE_START));
     }
-
-    if (state == HomeCard::VISIBLE_MINIMIZED)
-      shadow_.reset();
-    // Do not create the shadow yet. Instead, create it in OnWidgetMove(), to
-    // make sure that widget has been resized correctly (because the size of the
-    // shadow depends on the size of the widget).
+    wm::SetShadowType(GetWidget()->GetNativeView(),
+                      state == HomeCard::VISIBLE_MINIMIZED ?
+                      wm::SHADOW_TYPE_NONE :
+                      wm::SHADOW_TYPE_RECTANGULAR);
   }
 
   void ClearGesture() {
     gesture_manager_.reset();
   }
 
   // views::View:
   virtual void Layout() OVERRIDE {
     for (int i = 0; i < child_count(); ++i) {
       views::View* child = child_at(i);
@@ skipping 12 matching lines @@
       gesture_manager_.reset(new HomeCardGestureManager(
           gesture_delegate_,
           GetWidget()->GetNativeWindow()->GetRootWindow()->bounds()));
     }
 
     if (gesture_manager_)
       gesture_manager_->ProcessGestureEvent(event);
   }
 
  private:
-  // views::WidgetDelegate:
-  virtual void OnWidgetMove() OVERRIDE {
-    if (!minimized_view_->visible()) {
-      aura::Window* window = GetWidget()->GetNativeWindow();
-      if (!shadow_) {
-        shadow_.reset(new wm::Shadow());
-        shadow_->Init(wm::Shadow::STYLE_ACTIVE);
-        shadow_->SetContentBounds(gfx::Rect(window->bounds().size()));
-        shadow_->layer()->SetVisible(true);
-
-        ui::Layer* layer = window->layer();
-        layer->Add(shadow_->layer());
-      } else {
-        shadow_->SetContentBounds(gfx::Rect(window->bounds().size()));
-      }
-    }
-  }
-
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
 
   app_list::AppListMainView* main_view_;
   BottomHomeView* bottom_view_;
   views::View* minimized_view_;
-  scoped_ptr<wm::Shadow> shadow_;
   scoped_ptr<HomeCardGestureManager> gesture_manager_;
   HomeCardGestureManager::Delegate* gesture_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardView);
 };
 
 class HomeCardImpl : public HomeCard,
                      public AcceleratorHandler,
                      public HomeCardLayoutManager::Delegate,
                      public HomeCardGestureManager::Delegate,
@@ skipping 232 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena