[win] Set the profile path when enabling the app launcher.

apps/app_launcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/app_launcher.h"
 
 #include "apps/field_trial_names.h"
 #include "apps/pref_names.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/host_desktop.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
 namespace apps {
 
 bool IsAppLauncherEnabled() {

[tapted, 2013/07/11 06:54:45]

note: since /apps is skipped on andriod and iOS, the first #if is now logically
equivalent to 

#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

maybe better is:

#if defined(OS_CHROMEOS)
  return true;
#elif defined(OS_LINUX)
  return false;
#elif defined(ENABLE_APP_LIST)
#error
#else
/* etc */

[benwells, 2013/07/12 01:41:48]

Why would that be better? It is longer, and couples the ifdeffery with the
gypdeffery (shudder).

[tapted, 2013/07/12 04:58:27]

The alternative makes it possible to #error in case this file gets exposed to
some invalid set of flags, and make the CrOS condition more obvious. But yeah,
that would assume someone had made a mistake in the gyp conditions.

-#if defined(USE_ASH) && !defined(OS_WIN)
+#if !defined(ENABLE_APP_LIST)
+  return false;
+
+#elif defined(OS_CHROMEOS)
   return true;
-#elif !defined(OS_WIN)
-  return false;
-#else
-#if defined(USE_ASH)

[tapted, 2013/07/11 06:54:45]

guarding the next two lines doesn't really add anything, and makes things less
readable..

+
+#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
 }
 
 bool ShouldShowAppLauncherPromo() {
   PrefService* local_state = g_browser_process->local_state();
   // In some tests, the prefs aren't initialised.
   if (!local_state)
     return false;
   std::string app_launcher_promo_group_name =
       base::FieldTrialList::FindFullName(apps::kLauncherPromoTrialName);
   return !IsAppLauncherEnabled() &&
       local_state->GetBoolean(apps::prefs::kShowAppLauncherPromo) &&
       (app_launcher_promo_group_name == apps::kShowLauncherPromoOnceGroupName ||
        app_launcher_promo_group_name ==
           apps::kResetShowLauncherPromoPrefGroupName);
 }
 
 }  // namespace apps