Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(794)

Unified Diff: chrome/browser/ui/views/aura/chrome_shell_delegate.cc

Issue 8890049: [Aura] Implement views-based applist. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and refactored Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698