Index: chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
index fdfee855693203798230df1548913b8f6dbbb09a..fbf3c55d5a941c7e63925466bf86dba119f27053 100644 |
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
@@ -4,12 +4,16 @@ |
#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
+#include "base/command_line.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/views/aura/app_list_window.h" |
+#include "chrome/browser/ui/views/aura/app_list/app_list_model.h" |
#include "chrome/browser/ui/views/aura/status_area_host_aura.h" |
#include "chrome/browser/ui/views/frame/browser_view.h" |
+#include "ui/aura/aura_switches.h" |
#include "ui/aura/window.h" |
+#include "ui/aura_shell/app_list/app_list_view.h" |
#include "ui/aura_shell/launcher/launcher_types.h" |
#include "ui/aura_shell/window_util.h" |
@@ -61,8 +65,11 @@ views::Widget* ChromeShellDelegate::CreateStatusArea() { |
void ChromeShellDelegate::RequestAppListWidget( |
const gfx::Rect& bounds, |
const SetWidgetCallback& callback) { |
- // AppListWindow deletes itself when closed. |
- new AppListWindow(bounds, callback); |
+ // AppListWindow and AppListView deletes itself when closed. |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraViewsAppList)) |
+ new aura_shell::AppListView(new AppListModel(), bounds, callback); |
+ else |
+ new AppListWindow(bounds, callback); |
} |
void ChromeShellDelegate::LauncherItemClicked( |