Implement new strategy for default apps

chrome/common/chrome_switches.h

Index: chrome/common/chrome_switches.h
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index df3f002d5e6bf583ada5fc2dfbcd80b48e1f9141..030ce705c16168cc9032eeb1e3d25a33cc8ef791 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -51,7 +51,6 @@ extern const char kDiagnostics[];
 extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAltWinstation[];
 extern const char kDisableApplicationCache[];
-extern const char kDisableApps[];
 extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundNetworking[];
@@ -119,12 +118,12 @@ extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableBackgroundMode[];
 extern const char kEnableBenchmarking[];
-extern const char kEnableRemoting[];
 extern const char kEnableClearServerData[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableCloudPrint[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableContentPrefetch[];
+extern const char kEnableDefaultApps[];
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSSECCerts[];
 extern const char kEnableExperimentalExtensionApis[];
@@ -147,6 +146,7 @@ extern const char kEnableNativeWebWorkers[];
 extern const char kEnablePreconnect[];
 extern const char kEnablePreparsedJsCaching[];
 extern const char kEnablePrintPreview[];
+extern const char kEnableRemoting[];
 extern const char kEnableResourceContentSettings[];
 extern const char kEnableSearchProviderApiV2[];
 extern const char kEnableStatsTable[];