Revert 115515 - [Aura] Implement views-based applist.

ui/aura_shell/examples/aura_shell_main.cc

 // Copyright (c) 2011 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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura_shell/examples/example_factory.h"
 #include "ui/aura_shell/examples/toplevel_window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/window_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
+class AppListWindow : public views::WidgetDelegateView {
+ public:
+  AppListWindow() {
+  }
+
+  // static
+  static views::Widget* Create(const gfx::Rect& bounds) {
+    AppListWindow* app_list = new AppListWindow;
+
+    views::Widget::InitParams widget_params(
+        views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+    widget_params.bounds = bounds;
+    widget_params.delegate = app_list;
+    widget_params.keep_on_top = true;
+    widget_params.transparent = true;
+
+    views::Widget* widget = new views::Widget;
+    widget->Init(widget_params);
+    widget->SetContentsView(app_list);
+    return widget;
+  }
+
+  // Overridden from views::View:
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+    canvas->FillRect(SkColorSetARGB(0x4F, 0xFF, 0, 0), bounds());
+  }
+};
+
 class ShellDelegateImpl : public aura_shell::ShellDelegate {
  public:
   ShellDelegateImpl() {
   }
 
   virtual void CreateNewWindow() OVERRIDE {
     aura_shell::examples::ToplevelWindow::CreateParams create_params;
     create_params.can_resize = true;
     create_params.can_maximize = true;
     aura_shell::examples::ToplevelWindow::CreateToplevelWindow(create_params);
   }
 
   virtual views::Widget* CreateStatusArea() OVERRIDE {
     return aura_shell::internal::CreateStatusArea();
   }
 
   virtual void RequestAppListWidget(
       const gfx::Rect& bounds,
       const SetWidgetCallback& callback) OVERRIDE {
-    // TODO(xiyuan): Clean this up.
-    // The code below here is because we don't want to use
-    // --aura-views-applist. This function is deprecated and all code
-    // here will be removed when we clean it up.
-    aura_shell::examples::CreateAppList(bounds, callback);
-  }
-
-  virtual void BuildAppListModel(aura_shell::AppListModel* model) {
-    aura_shell::examples::BuildAppListModel(model);
-  }
-
-  virtual aura_shell::AppListViewDelegate* CreateAppListViewDelegate() {
-    return aura_shell::examples::CreateAppListViewDelegate();
+    callback.Run(AppListWindow::Create(bounds));
   }
 
   virtual void LauncherItemClicked(
       const aura_shell::LauncherItem& item) OVERRIDE {
     aura_shell::ActivateWindow(item.window);
   }
 
   virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE {
     static int image_count = 0;
     item->tab_images.resize(image_count + 1);
@@ skipping 41 matching lines @@
   aura::RootWindow::GetInstance()->Run();
 
   aura_shell::Shell::DeleteInstance();
 
   aura::RootWindow::DeleteInstance();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }