Move app list from ash to ui.

ash/shell.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/shell.h"
 
 #include <algorithm>
+#include <string>
 
-#include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/monitor/monitor_controller.h"
 #include "ash/monitor/multi_monitor_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_context_menu.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
+#include "ash/wm/app_list_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/key_rewriter_event_filter.h"
 #include "ash/wm/panel_layout_manager.h"
 #include "ash/wm/panel_window_event_filter.h"
 #include "ash/wm/partial_screenshot_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/resize_shadow_controller.h"
@@ skipping 17 matching lines @@
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor_manager.h"
-#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/widget/native_widget_aura.h"
@@ skipping 154 matching lines @@
   }
 
   virtual void OpenSetWallpaperPage() OVERRIDE {
   }
 
   virtual bool CanOpenSetWallpaperPage() OVERRIDE {
     return false;
   }
 
  private:
-   DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
+  DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
 };
 
 class DummySystemTrayDelegate : public SystemTrayDelegate {
  public:
   DummySystemTrayDelegate()
       : muted_(false),
         wifi_enabled_(true),
         cellular_enabled_(true),
         bluetooth_enabled_(true),
         volume_(0.5),
         caps_lock_enabled_(false) {
   }
 
   virtual ~DummySystemTrayDelegate() {}
 
  private:
-
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; }
 
   // Overridden from SystemTrayDelegate:
   virtual const std::string GetUserDisplayName() const OVERRIDE {
     return "Über tray Über tray Über tray Über tray";
   }
 
   virtual const std::string GetUserEmail() const OVERRIDE {
     return "über@tray";
   }
@@ skipping 495 matching lines @@
       GetRootWindow()->event_filter())->GetFilterCount();
 }
 
 void Shell::ShowBackgroundMenu(views::Widget* widget,
                                const gfx::Point& location) {
   if (shell_context_menu_.get())
     shell_context_menu_->ShowMenu(widget, location);
 }
 
 void Shell::ToggleAppList() {
-  if (!app_list_.get())
-    app_list_.reset(new internal::AppList);
-  app_list_->SetVisible(!app_list_->IsVisible());
+  if (!app_list_controller_.get())
+    app_list_controller_.reset(new internal::AppListController);
+  app_list_controller_->SetVisible(!app_list_controller_->IsVisible());
 }
 
 bool Shell::GetAppListTargetVisibility() const {
-  return app_list_.get() && app_list_->GetTargetVisibility();
+  return app_list_controller_.get() &&
+      app_list_controller_->GetTargetVisibility();
 }
 
 aura::Window* Shell::GetAppListWindow() {
-  return app_list_.get() ? app_list_->GetWindow() : NULL;
+  return app_list_controller_.get() ? app_list_controller_->GetWindow() : NULL;
 }
 
 bool Shell::IsScreenLocked() const {
   return !delegate_.get() || delegate_->IsScreenLocked();
 }
 
 bool Shell::IsModalWindowOpen() const {
   const aura::Window* modal_container = GetContainer(
       internal::kShellWindowId_SystemModalContainer);
   return !modal_container->children().empty();
@@ skipping 130 matching lines @@
     panel_container->SetLayoutManager(panel_layout_manager_);
   }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash