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

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

Issue 2438833002: Change about flag for doc.write to a tri-state so it can be disabled. (Closed)
Patch Set: Created 4 years, 2 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 | no next file » | 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 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_NAME, 1668 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_NAME,
1669 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_DESCRIPTION, kOsAndroid, 1669 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_DESCRIPTION, kOsAndroid,
1670 FEATURE_VALUE_TYPE(offline_pages::kBackgroundLoaderForDownloadsFeature)}, 1670 FEATURE_VALUE_TYPE(offline_pages::kBackgroundLoaderForDownloadsFeature)},
1671 #endif // OS_ANDROID 1671 #endif // OS_ANDROID
1672 {"disallow-doc-written-script-loads", 1672 {"disallow-doc-written-script-loads",
1673 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, 1673 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME,
1674 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, 1674 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll,
1675 // NOTE: if we want to add additional experiment entries for other 1675 // NOTE: if we want to add additional experiment entries for other
1676 // features controlled by kBlinkSettings, we'll need to add logic to 1676 // features controlled by kBlinkSettings, we'll need to add logic to
1677 // merge the flag values. 1677 // merge the flag values.
1678 SINGLE_VALUE_TYPE_AND_VALUE( 1678 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
1679 switches::kBlinkSettings, 1679 switches::kBlinkSettings,
1680 "disallowFetchForDocWrittenScriptsInMainFrame=true")}, 1680 "disallowFetchForDocWrittenScriptsInMainFrame=true",
1681 switches::kBlinkSettings,
1682 "disallowFetchForDocWrittenScriptsInMainFrame=false")},
1681 #if defined(OS_ANDROID) 1683 #if defined(OS_ANDROID)
1682 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, 1684 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME,
1683 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid, 1685 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid,
1684 ENABLE_DISABLE_VALUE_TYPE(ntp_tiles::switches::kEnableNTPPopularSites, 1686 ENABLE_DISABLE_VALUE_TYPE(ntp_tiles::switches::kEnableNTPPopularSites,
1685 ntp_tiles::switches::kDisableNTPPopularSites)}, 1687 ntp_tiles::switches::kDisableNTPPopularSites)},
1686 {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, 1688 {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME,
1687 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid, 1689 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid,
1688 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, 1690 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)},
1689 {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, 1691 {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME,
1690 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid, 1692 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid,
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
2263 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2265 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2264 2266
2265 const FeatureEntry* GetFeatureEntries(size_t* count) { 2267 const FeatureEntry* GetFeatureEntries(size_t* count) {
2266 *count = arraysize(kFeatureEntries); 2268 *count = arraysize(kFeatureEntries);
2267 return kFeatureEntries; 2269 return kFeatureEntries;
2268 } 2270 }
2269 2271
2270 } // namespace testing 2272 } // namespace testing
2271 2273
2272 } // namespace about_flags 2274 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698