| Index: chrome/browser/prefs/command_line_pref_store.cc
|
| diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
|
| index 8dd960316d71f20ed372f470ad715e243e633492..57439350ebbd4e3da921188fd2613e16350a6fa1 100644
|
| --- a/chrome/browser/prefs/command_line_pref_store.cc
|
| +++ b/chrome/browser/prefs/command_line_pref_store.cc
|
| @@ -29,6 +29,7 @@
|
| #include "components/ssl_config/ssl_config_switches.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "ui/base/ui_base_switches.h"
|
| +#include "ui/display/display_switches.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chromeos/chromeos_switches.h"
|
| @@ -55,27 +56,27 @@ const CommandLinePrefStore::PathSwitchToPreferenceMapEntry
|
|
|
| const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
|
| CommandLinePrefStore::boolean_switch_map_[] = {
|
| - { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true },
|
| - { switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled,
|
| - true },
|
| - { switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true },
|
| - { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
|
| - true },
|
| - { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
|
| - { switches::kNoReferrers, prefs::kEnableReferrers, false },
|
| - { switches::kAllowRunningInsecureContent,
|
| - prefs::kWebKitAllowRunningInsecureContent, true },
|
| - { switches::kAllowCrossOriginAuthPrompt,
|
| - prefs::kAllowCrossOriginAuthPrompt, true },
|
| - { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
|
| + {switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true},
|
| + {switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled,
|
| + true},
|
| + {switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true},
|
| + {switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
|
| + true},
|
| + {switches::kNoPings, prefs::kEnableHyperlinkAuditing, false},
|
| + {switches::kNoReferrers, prefs::kEnableReferrers, false},
|
| + {switches::kAllowRunningInsecureContent,
|
| + prefs::kWebKitAllowRunningInsecureContent, true},
|
| + {switches::kAllowCrossOriginAuthPrompt,
|
| + prefs::kAllowCrossOriginAuthPrompt, true},
|
| + {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
|
| #if defined(OS_CHROMEOS)
|
| - { chromeos::switches::kEnableTouchpadThreeFingerClick,
|
| - prefs::kEnableTouchpadThreeFingerClick, true },
|
| - { ash::switches::kAshEnableUnifiedDesktop,
|
| - prefs::kUnifiedDesktopEnabledByDefault, true },
|
| + {chromeos::switches::kEnableTouchpadThreeFingerClick,
|
| + prefs::kEnableTouchpadThreeFingerClick, true},
|
| + {switches::kEnableUnifiedDesktop,
|
| + prefs::kUnifiedDesktopEnabledByDefault, true},
|
| #endif
|
| - { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false },
|
| - { switches::kUnsafePacUrl, prefs::kPacHttpsUrlStrippingEnabled, false },
|
| + {switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false},
|
| + {switches::kUnsafePacUrl, prefs::kPacHttpsUrlStrippingEnabled, false},
|
| };
|
|
|
| const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry
|
|
|