Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: extensions/common/feature_switch.cc

Issue 1253993004: Reintroduce --prompt-for-external-extensions flag on Chromium builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment change in switches.cc Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | extensions/common/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/feature_switch.cc
diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc
index 28c72c30c7ade824fd586113321d35e01ff44526..38b21b58d2420aa0676a69c0e4499250c730167e 100644
--- a/extensions/common/feature_switch.cc
+++ b/extensions/common/feature_switch.cc
@@ -20,11 +20,16 @@ class CommonSwitches {
: easy_off_store_install(NULL, FeatureSwitch::DEFAULT_DISABLED),
force_dev_mode_highlighting(switches::kForceDevModeHighlighting,
FeatureSwitch::DEFAULT_DISABLED),
- prompt_for_external_extensions(NULL,
+ prompt_for_external_extensions(
+#if defined(CHROMIUM_BUILD)
+ switches::kPromptForExternalExtensions,
+#else
+ NULL,
+#endif
#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,
« no previous file with comments | « no previous file | extensions/common/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698