aura: Implement app list M19 mock.

ash/app_list/app_list.cc

 // Copyright (c) 2012 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 "ash/app_list/app_list.h"
 
-#include "ash/app_list/app_list_model.h"
 #include "ash/app_list/app_list_view.h"
 #include "ash/ash_switches.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
-// Gets preferred bounds of app list window in show/hide state.
-gfx::Rect GetPreferredBounds(bool show) {
-  // The y-axis offset used at the beginning of showing animation.
-  static const int kMoveUpAnimationOffset = 50;
-
+// Gets preferred bounds of app list window.
+gfx::Rect GetPreferredBounds() {
   gfx::Point cursor = gfx::Screen::GetCursorScreenPoint();
-  gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestPoint(cursor);
-  gfx::Rect widget_bounds(work_area);
-  widget_bounds.Inset(100, 100);
-  if (!show)
-    widget_bounds.Offset(0, kMoveUpAnimationOffset);
-
-  return widget_bounds;
+  return gfx::Screen::GetMonitorAreaNearestPoint(cursor);

[sky, 2012/03/01 00:26:57]

You sure you don't want work area?

[xiyuan, 2012/03/01 19:58:47]

Applist does not go behind the launcher in the mock but Glen and Alex mentioned
in issue 98308 @44 that the shades should go behind the launcher. That's why
using full monitor rect instead of work area.

Will add a comment.

 }
 
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppList, public:
 
 AppList::AppList() : is_visible_(false), widget_(NULL) {
 }
 
 AppList::~AppList() {
   ResetWidget();
 }
 
 void AppList::SetVisible(bool visible) {
   if (visible == is_visible_)
     return;
 
   is_visible_ = visible;
 
   if (widget_) {
     ScheduleAnimation();
   } else if (is_visible_) {
-    scoped_ptr<AppListModel> model(new AppListModel);
-    Shell::GetInstance()->delegate()->BuildAppListModel(model.get());
-
     // AppListModel and AppListViewDelegate are owned by AppListView. They
     // will be released with AppListView on close.
     AppListView* app_list_view = new AppListView(
-        model.release(),
         Shell::GetInstance()->delegate()->CreateAppListViewDelegate(),
-        GetPreferredBounds(false));
+        GetPreferredBounds());
     SetWidget(app_list_view->GetWidget());
   }
 }
 
 bool AppList::IsVisible() {
   return widget_ && widget_->IsVisible();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppList, private:
 
 void AppList::SetWidget(views::Widget* widget) {
   DCHECK(widget_ == NULL);
 
   if (is_visible_) {
     widget_ = widget;
     widget_->AddObserver(this);
     Shell::GetInstance()->AddRootWindowEventFilter(this);
 
-    widget_->SetBounds(GetPreferredBounds(false));
     widget_->SetOpacity(0);
     ScheduleAnimation();
 
     widget_->Show();
+    widget_->Activate();
   } else {
     widget->Close();
   }
 }
 
 void AppList::ResetWidget() {
   if (!widget_)
     return;
 
   widget_->RemoveObserver(this);
   GetLayer(widget_)->GetAnimator()->RemoveObserver(this);
   Shell::GetInstance()->RemoveRootWindowEventFilter(this);
   widget_ = NULL;
 }
 
 void AppList::ScheduleAnimation() {
   aura::Window* default_container = Shell::GetInstance()->GetContainer(
       internal::kShellWindowId_DefaultContainer);
   // |default_container| could be NULL during Shell shutdown.
   if (!default_container)
     return;
 
   ui::Layer* layer = GetLayer(widget_);
 
   // Stop observing previous animation.
   StopObservingImplicitAnimations();
 
   ui::ScopedLayerAnimationSettings app_list_animation(layer->GetAnimator());
   app_list_animation.AddObserver(this);
-  layer->SetBounds(GetPreferredBounds(is_visible_));
   layer->SetOpacity(is_visible_ ? 1.0 : 0.0);
 
   ui::Layer* default_container_layer = default_container->layer();
   ui::ScopedLayerAnimationSettings default_container_animation(
       default_container_layer->GetAnimator());
   app_list_animation.AddObserver(this);
   default_container_layer->SetOpacity(is_visible_ ? 0.0 : 1.0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 44 matching lines @@
 }
 
 void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) {
   DCHECK(widget_ == widget);
   if (widget_ && is_visible_ && !active)
     SetVisible(false);
 }
 
 }  // namespace internal
 }  // namespace ash