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

Unified Diff: athena/main/athena_main.cc

Issue 397343003: Introduce centered view and bottom view for home card. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 5 months 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
« no previous file with comments | « athena/home/minimized_home.cc ('k') | ui/app_list/views/tile_item_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index f829a2d4952418b8bf127ee6a37ffd55122d548e..628603427b79476c0aa4eff44267e3310dd48b7c 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -24,6 +24,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "content/public/app/content_main.h"
+#include "ui/app_list/app_list_switches.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/keyboard/keyboard_controller.h"
@@ -81,6 +82,10 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
// apps::ShellBrowserMainDelegate:
virtual void Start(content::BrowserContext* context) OVERRIDE {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+
+ // Force showing in the experimental app-list view.
+ command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
+
base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
command_line->HasSwitch(apps::switches::kAppShellAppPath) ?
command_line->GetSwitchValueNative(apps::switches::kAppShellAppPath) :
« no previous file with comments | « athena/home/minimized_home.cc ('k') | ui/app_list/views/tile_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698