new implementation of default apps

chrome/browser/extensions/default_apps.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/default_apps.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/l10n/l10n_util.h"
 
 static bool ShouldInstallInProfile(Profile* profile) {
   // We decide to install or not install default apps based on the following
   // criteria, from highest priority to lowest priority:
   //
   // - If this instance of chrome is participating in the default apps
   //   field trial, then install apps based on the group.
   // - The command line option.  Tests use this option to disable installation
   //   of default apps in some cases.
   // - If the locale is not compatible with the defaults, don't install them.
-  // - If the profile says to either always install or never install default
-  //   apps, obey.
   // - The kDefaultApps preferences value in the profile.  This value is
   //   usually set in the master_preferences file.
   bool install_apps =
       profile->GetPrefs()->GetString(prefs::kDefaultApps) == "install";
 
   default_apps::InstallState state =
       static_cast<default_apps::InstallState>(profile->GetPrefs()->GetInteger(
           prefs::kDefaultAppsInstallState));
   switch (state) {
     case default_apps::kUnknown: {
       // This is the first time the default apps feature runs on this profile.
       // Determine if we want to install them or not.
       chrome::VersionInfo version_info;
       if (!profile->WasCreatedByVersionOrLater(version_info.Version().c_str()))
         install_apps = false;
       break;
     }
+
     case default_apps::kAlwaysProvideDefaultApps:

[Mihai Parparita -not on Chrome, 2012/08/08 00:22:42]

It seems like in this case you'll want to migrate from the old default apps
mechanism (whcih used the EXTERNAL location) to the new one, otherwise users who
had their default apps before your CL will lose them (since they'll no longer be
provided).

[Gaurav, 2012/08/10 23:06:55]

install_apps becomes true in most cases from the kDefaultApps == "install" check
above.
On 2012/08/08 00:22:42, Mihai Parparita wrote:

-      install_apps = true;
-      break;
+    case default_apps::kAlreadyInstalledDefaultApps:
     case default_apps::kNeverProvideDefaultApps:
       install_apps = false;
       break;
     default:
       NOTREACHED();
   }
 
   if (install_apps) {
     // Don't bother installing default apps in locales where it is known that
     // they don't work.
     // TODO(rogerta): Do this check dynamically once the webstore can expose
     // an API. See http://crbug.com/101357
     const std::string& locale = g_browser_process->GetApplicationLocale();
     static const char* unsupported_locales[] = {"CN", "TR", "IR"};
     for (size_t i = 0; i < arraysize(unsupported_locales); ++i) {
       if (EndsWith(locale, unsupported_locales[i], false)) {
         install_apps = false;
         break;
       }
     }
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableDefaultApps)) {
     install_apps = false;
   }
 
   if (base::FieldTrialList::TrialExists(kDefaultAppsTrialName)) {
     install_apps = base::FieldTrialList::Find(

[Mihai Parparita -not on Chrome, 2012/08/08 00:22:43]

Is this how we end up with install_apps being true most of the time (otherwise,
it seems like we set it to false nearly everywhere else)?

         kDefaultAppsTrialName)->group_name() != kDefaultAppsTrialNoAppsGroup;
   }
 
-  // Save the state if needed.  Once it is decided whether we are installing
-  // default apps or not, we want to always respond with same value.  Therefore
-  // on first run of this feature (i.e. the current state is kUnknown) the
-  // state is updated to remember the choice that was made at this time.  The
-  // next time chrome runs it will use the same decision.
-  //
-  // The reason for responding with the same value is that once an external
-  // extenson provider has provided apps for a given profile, it must continue
-  // to provide those extensions on each subsequent run.  Otherwise the
-  // extension manager will automatically uninstall the apps.  The extension
-  // manager is smart enough to know not to reinstall the apps on all
-  // subsequent runs of chrome.
+  // Default apps are only installed on profile creation or a new chrome
+  // download.
   if (state == default_apps::kUnknown) {
     if (install_apps) {
-      profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
-                                      default_apps::kAlwaysProvideDefaultApps);
+      profile->GetPrefs()->SetInteger(
+          prefs::kDefaultAppsInstallState,
+          default_apps::kAlreadyInstalledDefaultApps);
     } else {
       profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
                                       default_apps::kNeverProvideDefaultApps);
     }
   }
 
   return install_apps;
 }
 
 namespace default_apps {
@@ skipping 20 matching lines @@
   if (!profile_ || !ShouldInstallInProfile(profile_)) {
     base::DictionaryValue* prefs = new base::DictionaryValue;
     SetPrefs(prefs);
     return;
   }
 
   extensions::ExternalProviderImpl::VisitRegisteredExtension();
 }
 
 }  // namespace default_apps