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

Unified Diff: apps/app_launcher.cc

Issue 18421007: [win] Set the profile path when enabling the app launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, and fix a few things Created 7 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 | « no previous file | apps/prefs.cc » ('j') | chrome/browser/ui/app_list/app_list_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/app_launcher.cc
diff --git a/apps/app_launcher.cc b/apps/app_launcher.cc
index 3f00b47a6cbeb8f36b9c72de1047e19cc5a8721d..4e1f379c29a3a326d2e6d4a7d014d0641c82b1c7 100644
--- a/apps/app_launcher.cc
+++ b/apps/app_launcher.cc
@@ -20,20 +20,19 @@
namespace apps {
bool IsAppLauncherEnabled() {
tapted 2013/07/11 06:54:45 note: since /apps is skipped on andriod and iOS, t
benwells 2013/07/12 01:41:48 Why would that be better? It is longer, and couple
tapted 2013/07/12 04:58:27 The alternative makes it possible to #error in cas
-#if defined(USE_ASH) && !defined(OS_WIN)
- return true;
-#elif !defined(OS_WIN)
+#if !defined(ENABLE_APP_LIST)
return false;
-#else
-#if defined(USE_ASH)
tapted 2013/07/11 06:54:45 guarding the next two lines doesn't really add any
+
+#elif defined(OS_CHROMEOS)
+ return true;
+
+#else // defined(ENABLE_APP_LIST) && !defined(OS_CHROMEOS)
if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
return true;
-#endif
+
PrefService* prefs = g_browser_process->local_state();
// In some tests, the prefs aren't initialised.
- if (!prefs)
- return false;
- return prefs->GetBoolean(prefs::kAppLauncherHasBeenEnabled);
+ return prefs && prefs->GetBoolean(prefs::kAppLauncherHasBeenEnabled);
#endif
}
« no previous file with comments | « no previous file | apps/prefs.cc » ('j') | chrome/browser/ui/app_list/app_list_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698