| Index: chrome/common/chrome_switches.h
|
| diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
|
| index 7d47a4363fd9fd0d67c7bfb12e3fd74dc4c71d2b..41aaa91461f10aab5d4155ff9c29315d8929edf8 100644
|
| --- a/chrome/common/chrome_switches.h
|
| +++ b/chrome/common/chrome_switches.h
|
| @@ -147,7 +147,6 @@ extern const char kEnableExtensionActivityLogTesting[];
|
| extern const char kEnableFastUnload[];
|
| extern const char kEnableIPv6[];
|
| extern const char kEnableLinkableEphemeralApps[];
|
| -extern const char kEnableManagedStorage[];
|
| extern const char kEnableNaCl[];
|
| extern const char kEnableNetBenchmarking[];
|
| extern const char kEnableNpnHttpOnly[];
|
| @@ -229,8 +228,8 @@ extern const char kLoadExtension[];
|
| extern const char kMalwareInterstitialVersionV2[];
|
| extern const char kMalwareInterstitialVersionV3[];
|
| extern const char kMakeDefaultBrowser[];
|
| -extern const char kManagedUserId[];
|
| -extern const char kManagedUserSyncToken[];
|
| +extern const char kSupervisedUserId[];
|
| +extern const char kSupervisedUserSyncToken[];
|
| extern const char kManualEnhancedBookmarks[];
|
| extern const char kManualEnhancedBookmarksOptout[];
|
| extern const char kMediaCacheSize[];
|
| @@ -248,7 +247,7 @@ extern const char kNoProxyServer[];
|
| extern const char kNoPings[];
|
| extern const char kNoServiceAutorun[];
|
| extern const char kNoStartupWindow[];
|
| -extern const char kNoManagedUserAcknowledgmentCheck[];
|
| +extern const char kNoSupervisedUserAcknowledgmentCheck[];
|
| extern const char kNtpAppInstallHint[];
|
| extern const char kNumPacThreads[];
|
| extern const char kOpenInNewWindow[];
|
|
|