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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2907153006: Add new mark-non-secure-as options to chrome://flags (Closed)
Patch Set: Change 'while' to 'after' Created 3 years, 6 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 | chrome/browser/flag_descriptions.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 const FeatureEntry::Choice kPassiveListenersChoices[] = { 228 const FeatureEntry::Choice kPassiveListenersChoices[] = {
229 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 229 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
230 {flag_descriptions::kPassiveEventListenerTrue, 230 {flag_descriptions::kPassiveEventListenerTrue,
231 switches::kPassiveListenersDefault, "true"}, 231 switches::kPassiveListenersDefault, "true"},
232 {flag_descriptions::kPassiveEventListenerForceAllTrue, 232 {flag_descriptions::kPassiveEventListenerForceAllTrue,
233 switches::kPassiveListenersDefault, "forcealltrue"}, 233 switches::kPassiveListenersDefault, "forcealltrue"},
234 }; 234 };
235 235
236 const FeatureEntry::Choice kMarkHttpAsChoices[] = { 236 const FeatureEntry::Choice kMarkHttpAsChoices[] = {
237 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 237 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
238 {flag_descriptions::kMarkHttpAsNonSecureAfterEditing,
239 security_state::switches::kMarkHttpAs,
240 security_state::switches::kMarkHttpAsNonSecureAfterEditing},
241 {flag_descriptions::kMarkHttpAsNonSecureWhileIncognito,
242 security_state::switches::kMarkHttpAs,
243 security_state::switches::kMarkHttpAsNonSecureWhileIncognito},
244 {flag_descriptions::kMarkHttpAsNonSecureWhileIncognitoOrEditing,
245 security_state::switches::kMarkHttpAs,
246 security_state::switches::kMarkHttpAsNonSecureWhileIncognitoOrEditing},
238 {flag_descriptions::kMarkHttpAsDangerous, 247 {flag_descriptions::kMarkHttpAsDangerous,
239 security_state::switches::kMarkHttpAs, 248 security_state::switches::kMarkHttpAs,
240 security_state::switches::kMarkHttpAsDangerous}}; 249 security_state::switches::kMarkHttpAsDangerous}};
241 250
242 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = { 251 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = {
243 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 252 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
244 {flag_descriptions::kDataReductionProxyLoFiAlwaysOn, 253 {flag_descriptions::kDataReductionProxyLoFiAlwaysOn,
245 data_reduction_proxy::switches::kDataReductionProxyLoFi, 254 data_reduction_proxy::switches::kDataReductionProxyLoFi,
246 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, 255 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn},
247 {flag_descriptions::kDataReductionProxyLoFiCellularOnly, 256 {flag_descriptions::kDataReductionProxyLoFiCellularOnly,
(...skipping 3010 matching lines...) Expand 10 before | Expand all | Expand 10 after
3258 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3267 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3259 3268
3260 const FeatureEntry* GetFeatureEntries(size_t* count) { 3269 const FeatureEntry* GetFeatureEntries(size_t* count) {
3261 *count = arraysize(kFeatureEntries); 3270 *count = arraysize(kFeatureEntries);
3262 return kFeatureEntries; 3271 return kFeatureEntries;
3263 } 3272 }
3264 3273
3265 } // namespace testing 3274 } // namespace testing
3266 3275
3267 } // namespace about_flags 3276 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698