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

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

Issue 2068393002: Flag for Offline Page Sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve merge conflict Created 4 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_feature_list.cc » ('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 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)}, 676 SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)},
677 {"disable-accelerated-2d-canvas", IDS_FLAGS_ACCELERATED_2D_CANVAS_NAME, 677 {"disable-accelerated-2d-canvas", IDS_FLAGS_ACCELERATED_2D_CANVAS_NAME,
678 IDS_FLAGS_ACCELERATED_2D_CANVAS_DESCRIPTION, kOsAll, 678 IDS_FLAGS_ACCELERATED_2D_CANVAS_DESCRIPTION, kOsAll,
679 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, 679 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
680 {"enable-display-list-2d-canvas", IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_NAME, 680 {"enable-display-list-2d-canvas", IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_NAME,
681 IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_DESCRIPTION, kOsAll, 681 IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_DESCRIPTION, kOsAll,
682 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDisplayList2dCanvas, 682 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDisplayList2dCanvas,
683 switches::kDisableDisplayList2dCanvas)}, 683 switches::kDisableDisplayList2dCanvas)},
684 {"enable-canvas-2d-dynamic-rendering-mode-switching", 684 {"enable-canvas-2d-dynamic-rendering-mode-switching",
685 IDS_FLAGS_ENABLE_2D_CANVAS_DYNAMIC_RENDERING_MODE_SWITCHING_NAME, 685 IDS_FLAGS_ENABLE_2D_CANVAS_DYNAMIC_RENDERING_MODE_SWITCHING_NAME,
686 IDS_FLAGS_ENABLE_2D_CANVAS_DYNAMIC_RENDERING_MODE_SWITCHING_DESCRIPTION, kO sAll, 686 IDS_FLAGS_ENABLE_2D_CANVAS_DYNAMIC_RENDERING_MODE_SWITCHING_DESCRIPTION,
687 kOsAll,
687 SINGLE_VALUE_TYPE(switches::kEnableCanvas2dDynamicRenderingModeSwitching)}, 688 SINGLE_VALUE_TYPE(switches::kEnableCanvas2dDynamicRenderingModeSwitching)},
688 {"composited-layer-borders", IDS_FLAGS_COMPOSITED_LAYER_BORDERS, 689 {"composited-layer-borders", IDS_FLAGS_COMPOSITED_LAYER_BORDERS,
689 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, kOsAll, 690 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, kOsAll,
690 SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)}, 691 SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
691 #if defined(ENABLE_WEBRTC) 692 #if defined(ENABLE_WEBRTC)
692 {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, 693 {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME,
693 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, 694 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS,
694 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, 695 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
695 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, 696 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME,
696 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 697 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, 1682 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)},
1682 #endif // defined(OS_ANDROID) 1683 #endif // defined(OS_ANDROID)
1683 #if defined(OS_ANDROID) 1684 #if defined(OS_ANDROID)
1684 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, 1685 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME,
1685 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, 1686 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid,
1686 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, 1687 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)},
1687 {"offline-pages-background-loading", 1688 {"offline-pages-background-loading",
1688 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, 1689 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME,
1689 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, 1690 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid,
1690 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, 1691 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)},
1692 {"offline-pages-sharing", IDS_FLAGS_OFFLINE_PAGES_SHARING_NAME,
1693 IDS_FLAGS_OFFLINE_PAGES_SHARING_DESCRIPTION, kOsAndroid,
1694 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesSharingFeature)},
1691 #endif // defined(OS_ANDROID) 1695 #endif // defined(OS_ANDROID)
1692 {"disallow-doc-written-script-loads", 1696 {"disallow-doc-written-script-loads",
1693 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, 1697 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME,
1694 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, 1698 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll,
1695 // NOTE: if we want to add additional experiment entries for other 1699 // NOTE: if we want to add additional experiment entries for other
1696 // features controlled by kBlinkSettings, we'll need to add logic to 1700 // features controlled by kBlinkSettings, we'll need to add logic to
1697 // merge the flag values. 1701 // merge the flag values.
1698 SINGLE_VALUE_TYPE_AND_VALUE( 1702 SINGLE_VALUE_TYPE_AND_VALUE(
1699 switches::kBlinkSettings, 1703 switches::kBlinkSettings,
1700 "disallowFetchForDocWrittenScriptsInMainFrame=true")}, 1704 "disallowFetchForDocWrittenScriptsInMainFrame=true")},
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
2010 chromeos::switches::kDisableFilesQuickView)}, 2014 chromeos::switches::kDisableFilesQuickView)},
2011 #endif // defined(OS_CHROMEOS) 2015 #endif // defined(OS_CHROMEOS)
2012 #if defined(OS_ANDROID) 2016 #if defined(OS_ANDROID)
2013 {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME, 2017 {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME,
2014 IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid, 2018 IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid,
2015 SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)}, 2019 SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)},
2016 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME, 2020 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME,
2017 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, 2021 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid,
2018 FEATURE_VALUE_TYPE(features::kWebPayments)}, 2022 FEATURE_VALUE_TYPE(features::kWebPayments)},
2019 #endif // defined(OS_ANDROID) 2023 #endif // defined(OS_ANDROID)
2020 // NOTE: Adding new command-line switches requires adding corresponding 2024 // NOTE: Adding new command-line switches requires adding corresponding
2021 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2025 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2022 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2026 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2023 }; 2027 };
2024 2028
2025 class FlagsStateSingleton { 2029 class FlagsStateSingleton {
2026 public: 2030 public:
2027 FlagsStateSingleton() 2031 FlagsStateSingleton()
2028 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 2032 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
2029 ~FlagsStateSingleton() {} 2033 ~FlagsStateSingleton() {}
2030 2034
2031 static FlagsStateSingleton* GetInstance() { 2035 static FlagsStateSingleton* GetInstance() {
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
2200 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2204 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2201 2205
2202 const FeatureEntry* GetFeatureEntries(size_t* count) { 2206 const FeatureEntry* GetFeatureEntries(size_t* count) {
2203 *count = arraysize(kFeatureEntries); 2207 *count = arraysize(kFeatureEntries);
2204 return kFeatureEntries; 2208 return kFeatureEntries;
2205 } 2209 }
2206 2210
2207 } // namespace testing 2211 } // namespace testing
2208 2212
2209 } // namespace about_flags 2213 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_feature_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698