| Index: chrome/common/pref_names.h
|
| diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
| index 8b7f3ed4dd4add25094733a0f598a137de72ab06..8575463e7d04520a14cab1c93208bd7aebefd348 100644
|
| --- a/chrome/common/pref_names.h
|
| +++ b/chrome/common/pref_names.h
|
| @@ -748,12 +748,10 @@ extern const char kResolveDeviceTimezoneByGeolocation[];
|
| extern const char kSystemTimezoneAutomaticDetectionPolicy[];
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| extern const char kEnableMediaRouter[];
|
| #if !defined(OS_ANDROID)
|
| extern const char kShowCastIconInToolbar[];
|
| #endif // !defined(OS_ANDROID)
|
| -#endif // defined(ENABLE_MEDIA_ROUTER)
|
|
|
| #if !defined(OS_ANDROID)
|
| extern const char kAttemptedToEnableAutoupdate[];
|
| @@ -863,12 +861,10 @@ extern const char kClickedUpdateMenuItem[];
|
| extern const char kLatestVersionWhenClickedUpdateMenuItem[];
|
| #endif
|
|
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| extern const char kMediaRouterCloudServicesPrefSet[];
|
| extern const char kMediaRouterEnableCloudServices[];
|
| extern const char kMediaRouterFirstRunFlowAcknowledged[];
|
| extern const char kMediaRouterTabMirroringSources[];
|
| -#endif
|
|
|
| extern const char kOriginTrialPublicKey[];
|
| extern const char kOriginTrialDisabledFeatures[];
|
|
|