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

Side by Side 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: 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 unified diff | Download patch
« no previous file with comments | « no previous file | extensions/common/switches.h » ('j') | extensions/common/switches.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/common/feature_switch.h" 5 #include "extensions/common/feature_switch.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "extensions/common/switches.h" 11 #include "extensions/common/switches.h"
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 namespace { 15 namespace {
16 16
17 class CommonSwitches { 17 class CommonSwitches {
18 public: 18 public:
19 CommonSwitches() 19 CommonSwitches()
20 : easy_off_store_install(NULL, FeatureSwitch::DEFAULT_DISABLED), 20 : easy_off_store_install(NULL, FeatureSwitch::DEFAULT_DISABLED),
21 force_dev_mode_highlighting(switches::kForceDevModeHighlighting, 21 force_dev_mode_highlighting(switches::kForceDevModeHighlighting,
22 FeatureSwitch::DEFAULT_DISABLED), 22 FeatureSwitch::DEFAULT_DISABLED),
23 prompt_for_external_extensions(NULL, 23 prompt_for_external_extensions(
24 #if defined(CHROMIUM_BUILD)
25 switches::kPromptForExternalExtensions,
26 #else
27 NULL,
28 #endif
24 #if defined(OS_WIN) 29 #if defined(OS_WIN)
25 FeatureSwitch::DEFAULT_ENABLED), 30 FeatureSwitch::DEFAULT_ENABLED),
26 #else 31 #else
27 FeatureSwitch::DEFAULT_DISABLED), 32 FeatureSwitch::DEFAULT_DISABLED),
28 #endif 33 #endif
29 error_console(switches::kErrorConsole, FeatureSwitch::DEFAULT_DISABLED), 34 error_console(switches::kErrorConsole, FeatureSwitch::DEFAULT_DISABLED),
30 enable_override_bookmarks_ui(switches::kEnableOverrideBookmarksUI, 35 enable_override_bookmarks_ui(switches::kEnableOverrideBookmarksUI,
31 FeatureSwitch::DEFAULT_DISABLED), 36 FeatureSwitch::DEFAULT_DISABLED),
32 extension_action_redesign(switches::kExtensionActionRedesign, 37 extension_action_redesign(switches::kExtensionActionRedesign,
33 FeatureSwitch::DEFAULT_DISABLED), 38 FeatureSwitch::DEFAULT_DISABLED),
34 scripts_require_action(switches::kScriptsRequireAction, 39 scripts_require_action(switches::kScriptsRequireAction,
35 FeatureSwitch::DEFAULT_DISABLED), 40 FeatureSwitch::DEFAULT_DISABLED),
36 embedded_extension_options(switches::kEmbeddedExtensionOptions, 41 embedded_extension_options(switches::kEmbeddedExtensionOptions,
37 FeatureSwitch::DEFAULT_DISABLED), 42 FeatureSwitch::DEFAULT_DISABLED),
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 171
167 void FeatureSwitch::SetOverrideValue(OverrideValue override_value) { 172 void FeatureSwitch::SetOverrideValue(OverrideValue override_value) {
168 override_value_ = override_value; 173 override_value_ = override_value;
169 } 174 }
170 175
171 FeatureSwitch::OverrideValue FeatureSwitch::GetOverrideValue() const { 176 FeatureSwitch::OverrideValue FeatureSwitch::GetOverrideValue() const {
172 return override_value_; 177 return override_value_;
173 } 178 }
174 179
175 } // namespace extensions 180 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | extensions/common/switches.h » ('j') | extensions/common/switches.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698