athena: Make some UI changes to the home-card bottom-view to match the mocks.

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 <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/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 56 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardLayoutManager);
 };
 
 // The container view of home card contents of each state.
 class HomeCardView : public views::WidgetDelegateView {
  public:
   HomeCardView(app_list::AppListViewDelegate* view_delegate,
                aura::Window* container,
                MinimizedHomeDragDelegate* minimized_delegate) {
-    set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
-
     bottom_view_ = new BottomHomeView(view_delegate);
     AddChildView(bottom_view_);
 
     main_view_ = new app_list::AppListMainView(
         view_delegate, 0 /* initial_apps_page */, container);
     AddChildView(main_view_);
+    main_view_->set_background(
+        views::Background::CreateSolidBackground(SK_ColorWHITE));
 
     minimized_view_ = CreateMinimizedHome(minimized_delegate);
     AddChildView(minimized_view_);
   }
 
   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_BOTTOM)
+      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).
   }
 
   // views::View:
   virtual void Layout() OVERRIDE {
     for (int i = 0; i < child_count(); ++i) {
       views::View* child = child_at(i);
       if (child->visible()) {
         child->SetBoundsRect(bounds());
         return;
       }
     }
 
     // One of the child views has to be visible.
     NOTREACHED();
   }
 
  private:
   // views::WidgetDelegate:
+  virtual void OnWidgetMove() OVERRIDE {
+    if (bottom_view_->visible() && !shadow_) {
+      aura::Window* window = GetWidget()->GetNativeWindow();
+      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());
+    }
+  }
+
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
 
   app_list::AppListMainView* main_view_;
   BottomHomeView* bottom_view_;
   views::View* minimized_view_;
+  scoped_ptr<wm::Shadow> shadow_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardView);
 };
 
 class HomeCardImpl : public HomeCard,
                      public AcceleratorHandler,
                      public HomeCardLayoutManager::Delegate,
                      public MinimizedHomeDragDelegate,
                      public WindowManagerObserver,
                      public aura::client::ActivationChangeObserver {
@@ skipping 45 matching lines @@
         return kHomeCardMinimizedHeight;
       case HIDDEN:
         break;
     }
     NOTREACHED();
     return -1;
   }
 
   virtual int GetHorizontalMargin() const OVERRIDE {
     CHECK_NE(HIDDEN, state_);
-    const int kHomeCardHorizontalMargin = 50;
+    const int kHomeCardHorizontalMargin = 100;
     return state_ == VISIBLE_BOTTOM ? kHomeCardHorizontalMargin : 0;
   }
 
   virtual aura::Window* GetNativeWindow() OVERRIDE {
     if (state_ == HIDDEN)
       return NULL;
 
     return home_card_widget_ ? home_card_widget_->GetNativeWindow() : NULL;
   }
 
@@ skipping 161 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena