Revert "Remove --enable-default-apps flag, making it default to on. This"

This reverts commit 788d69e77c290a2563604dfc04ec9f9e95b5b9a0.

TBR=jstritar@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67755 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 0 deletions

diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index 8b5767b..6e19ef4 100644
--- a/chrome/browser/profile_impl.cc
+++ b/chrome/browser/profile_impl.cc
@@ -402,6 +402,14 @@ void ProfileImpl::RegisterComponentExtensions() {
 }
 
 void ProfileImpl::InstallDefaultApps() {
+#if !defined(OS_CHROMEOS)
+  // On desktop Chrome, we don't have default apps on by, err, default yet.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableDefaultApps)) {
+    return;
+  }
+#endif
+
   // The web store only supports en-US at the moment, so we don't install
   // default apps in other locales.
   if (g_browser_process->GetApplicationLocale() != "en-US")
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 3f1e7c5..9606559 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -445,6 +445,10 @@ const char kEnableContentPrefetch[]         = "enable-content-prefetch";
 // Enables web developers to create apps for Chrome without using crx packages.
 const char kEnableCrxlessWebApps[]          = "enable-crxless-web-apps";
 
+// Whether default apps should be installed in this profile. This flag has no
+// effect on Chrome OS because default apps are always enabled  there.
+const char kEnableDefaultApps[]             = "enable-default-apps";
+
 // Enables device motion events.
 const char kEnableDeviceMotion[]            = "enable-device-motion";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index b7f39a3..edfff8a 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -134,6 +134,7 @@ extern const char kEnableConfirmToQuit[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableContentPrefetch[];
 extern const char kEnableCrxlessWebApps[];
+extern const char kEnableDefaultApps[];
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSCertProvenanceChecking[];
 extern const char kEnableDNSSECCerts[];