| Index: extensions/common/feature_switch.cc
|
| diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc
|
| index 4ff713755ff8b9bc46221c4127122f75868621f0..08417bc7dc4708dc4f6c5c8ff0f5f8d59e584653 100644
|
| --- a/extensions/common/feature_switch.cc
|
| +++ b/extensions/common/feature_switch.cc
|
| @@ -17,35 +17,25 @@ namespace {
|
| class CommonSwitches {
|
| public:
|
| CommonSwitches()
|
| - : easy_off_store_install(
|
| - NULL,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| - force_dev_mode_highlighting(
|
| - switches::kForceDevModeHighlighting,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| - prompt_for_external_extensions(
|
| - NULL,
|
| + : easy_off_store_install(nullptr, FeatureSwitch::DEFAULT_DISABLED),
|
| + force_dev_mode_highlighting(switches::kForceDevModeHighlighting,
|
| + FeatureSwitch::DEFAULT_DISABLED),
|
| + prompt_for_external_extensions(nullptr,
|
| #if defined(OS_WIN)
|
| - FeatureSwitch::DEFAULT_ENABLED),
|
| + FeatureSwitch::DEFAULT_ENABLED),
|
| #else
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| + FeatureSwitch::DEFAULT_DISABLED),
|
| #endif
|
| - error_console(
|
| - switches::kErrorConsole,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| - enable_override_bookmarks_ui(
|
| - switches::kEnableOverrideBookmarksUI,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| - extension_action_redesign(
|
| - switches::kExtensionActionRedesign,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| + error_console(switches::kErrorConsole, FeatureSwitch::DEFAULT_DISABLED),
|
| + enable_override_bookmarks_ui(switches::kEnableOverrideBookmarksUI,
|
| + FeatureSwitch::DEFAULT_DISABLED),
|
| + extension_action_redesign(switches::kExtensionActionRedesign,
|
| + FeatureSwitch::DEFAULT_DISABLED),
|
| scripts_require_action(switches::kScriptsRequireAction,
|
| FeatureSwitch::DEFAULT_DISABLED),
|
| - embedded_extension_options(
|
| - switches::kEmbeddedExtensionOptions,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| - app_view(switches::kAppView,
|
| - FeatureSwitch::DEFAULT_DISABLED),
|
| + embedded_extension_options(switches::kEmbeddedExtensionOptions,
|
| + FeatureSwitch::DEFAULT_DISABLED),
|
| + app_view(switches::kAppView, FeatureSwitch::DEFAULT_DISABLED),
|
| mime_handler_view(switches::kMimeHandlerView,
|
| FeatureSwitch::DEFAULT_DISABLED) {}
|
|
|
|
|