4 files changed, 23 insertions, 17 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index 2e4fd77..4430e7b 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -2,16 +2,16 @@
 // 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_item_model.h"
-#include "ash/app_list/app_list_item_view.h"
-#include "ash/app_list/app_list_model.h"
-#include "ash/app_list/app_list_view.h"
-#include "ash/app_list/app_list_view_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "base/basictypes.h"
+#include "ui/app_list/app_list_item_model.h"
+#include "ui/app_list/app_list_item_view.h"
+#include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_view.h"
+#include "ui/app_list/app_list_view_delegate.h"
 #include "ui/views/examples/examples_window.h"
 
 namespace ash {
@@ -19,7 +19,7 @@ namespace shell {
 
 namespace {
 
-class WindowTypeLauncherItem : public ash::AppListItemModel {
+class WindowTypeLauncherItem : public app_list::AppListItemModel {
  public:
   enum Type {
     TOPLEVEL_WINDOW = 0,
@@ -30,7 +30,7 @@ class WindowTypeLauncherItem : public ash::AppListItemModel {
     LAST_TYPE,
   };
 
-  WindowTypeLauncherItem(Type type) : type_(type) {
+  explicit WindowTypeLauncherItem(Type type) : type_(type) {
     SetIcon(GetIcon(type));
     SetTitle(GetTitle(type));
   }
@@ -108,13 +108,13 @@ class WindowTypeLauncherItem : public ash::AppListItemModel {
   DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncherItem);
 };
 
-class ExampleAppListViewDelegate : public ash::AppListViewDelegate {
+class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
  public:
   ExampleAppListViewDelegate() : model_(NULL) {}
 
  private:
   // Overridden from ash::AppListViewDelegate:
-  virtual void SetModel(AppListModel* model) OVERRIDE {
+  virtual void SetModel(app_list::AppListModel* model) OVERRIDE {
     model_ = model;
   }
 
@@ -133,19 +133,25 @@ class ExampleAppListViewDelegate : public ash::AppListViewDelegate {
     }
   }
 
-  virtual void OnAppListItemActivated(ash::AppListItemModel* item,
+  virtual void OnAppListItemActivated(app_list::AppListItemModel* item,
                                       int event_flags) OVERRIDE {
     static_cast<WindowTypeLauncherItem*>(item)->Activate(event_flags);
   }
 
-  AppListModel* model_;
+  virtual void Close() OVERRIDE {
+    DCHECK(ash::Shell::HasInstance());
+    if (Shell::GetInstance()->GetAppListTargetVisibility())
+      Shell::GetInstance()->ToggleAppList();
+  }
+
+  app_list::AppListModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
 };
 
 }  // namespace
 
-ash::AppListViewDelegate* CreateAppListViewDelegate() {
+app_list::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
diff --git a/ash/shell/example_factory.h b/ash/shell/example_factory.h
index 225a2fb..7ce4f5f 100644
--- a/ash/shell/example_factory.h
+++ b/ash/shell/example_factory.h
@@ -6,7 +6,7 @@
 #define ASH_SHELL_EXAMPLE_FACTORY_H_
 #pragma once
 
-namespace ash {
+namespace app_list {
 class AppListModel;
 class AppListViewDelegate;
 }
@@ -25,9 +25,9 @@ void CreateLockScreen();
 // Creates a window showing samples of commonly used widgets.
 void CreateWidgetsWindow();
 
-void BuildAppListModel(ash::AppListModel* model);
+void BuildAppListModel(app_list::AppListModel* model);
 
-ash::AppListViewDelegate* CreateAppListViewDelegate();
+app_list::AppListViewDelegate* CreateAppListViewDelegate();
 
 }  // namespace shell
 }  // namespace ash
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 31edb6a..f1d52bb 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -82,7 +82,7 @@ content::BrowserContext* ShellDelegateImpl::GetCurrentBrowserContext() {
 void ShellDelegateImpl::ToggleSpokenFeedback() {
 }
 
-ash::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() {
+app_list::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() {
   return ash::shell::CreateAppListViewDelegate();
 }
 
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 71b65b2..de999f8 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -35,7 +35,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual void OpenMobileSetup() OVERRIDE;
   virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
   virtual void ToggleSpokenFeedback() OVERRIDE;
-  virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
+  virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual void StartPartialScreenshot(
       ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;
   virtual ash::LauncherDelegate* CreateLauncherDelegate(