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

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

Issue 2480773002: Reland of [sensors] Ambient light sensor implementation for ChromeOS and Linux. (Closed)
Patch Set: remove parenthesis Created 4 years, 1 month 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 | content/browser/frame_host/render_frame_host_impl.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 1782 matching lines...) Expand 10 before | Expand all | Expand 10 after
1793 IDS_FLAGS_SET_MARKET_URL_FOR_TESTING_DESCRIPTION, kOsAndroid, 1793 IDS_FLAGS_SET_MARKET_URL_FOR_TESTING_DESCRIPTION, kOsAndroid,
1794 SINGLE_VALUE_TYPE_AND_VALUE( 1794 SINGLE_VALUE_TYPE_AND_VALUE(
1795 switches::kMarketUrlForTesting, 1795 switches::kMarketUrlForTesting,
1796 "https://play.google.com/store/apps/details?id=com.android.chrome")}, 1796 "https://play.google.com/store/apps/details?id=com.android.chrome")},
1797 #endif // OS_ANDROID 1797 #endif // OS_ANDROID
1798 #if defined(OS_WIN) || defined(OS_MACOSX) 1798 #if defined(OS_WIN) || defined(OS_MACOSX)
1799 {"automatic-tab-discarding", IDS_FLAGS_AUTOMATIC_TAB_DISCARDING_NAME, 1799 {"automatic-tab-discarding", IDS_FLAGS_AUTOMATIC_TAB_DISCARDING_NAME,
1800 IDS_FLAGS_AUTOMATIC_TAB_DISCARDING_DESCRIPTION, kOsWin | kOsMac, 1800 IDS_FLAGS_AUTOMATIC_TAB_DISCARDING_DESCRIPTION, kOsWin | kOsMac,
1801 FEATURE_VALUE_TYPE(features::kAutomaticTabDiscarding)}, 1801 FEATURE_VALUE_TYPE(features::kAutomaticTabDiscarding)},
1802 #endif // OS_WIN || OS_MACOSX 1802 #endif // OS_WIN || OS_MACOSX
1803 {"enable-es3-apis", IDS_FLAGS_WEBGL2_NAME, 1803 {"enable-es3-apis", IDS_FLAGS_WEBGL2_NAME, IDS_FLAGS_WEBGL2_DESCRIPTION,
1804 IDS_FLAGS_WEBGL2_DESCRIPTION, kOsAll, 1804 kOsAll, MULTI_VALUE_TYPE(kEnableWebGL2Choices)},
1805 MULTI_VALUE_TYPE(kEnableWebGL2Choices)},
1806 {"enable-webfonts-intervention-v2", 1805 {"enable-webfonts-intervention-v2",
1807 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME, 1806 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME,
1808 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, kOsAll, 1807 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, kOsAll,
1809 MULTI_VALUE_TYPE(kEnableWebFontsInterventionV2Choices)}, 1808 MULTI_VALUE_TYPE(kEnableWebFontsInterventionV2Choices)},
1810 {"enable-webfonts-intervention-trigger", 1809 {"enable-webfonts-intervention-trigger",
1811 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_NAME, 1810 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_NAME,
1812 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_DESCRIPTION, kOsAll, 1811 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_DESCRIPTION, kOsAll,
1813 SINGLE_VALUE_TYPE(switches::kEnableWebFontsInterventionTrigger)}, 1812 SINGLE_VALUE_TYPE(switches::kEnableWebFontsInterventionTrigger)},
1814 {"enable-grouped-history", IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, 1813 {"enable-grouped-history", IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME,
1815 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, kOsDesktop, 1814 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, kOsDesktop,
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
2039 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" 2038 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/"
2040 "ExchangeToken")}, 2039 "ExchangeToken")},
2041 {"arc-boot-completed-broadcast", IDS_FLAGS_ARC_BOOT_COMPLETED, 2040 {"arc-boot-completed-broadcast", IDS_FLAGS_ARC_BOOT_COMPLETED,
2042 IDS_FLAGS_ARC_BOOT_COMPLETED_DESCRIPTION, kOsCrOS, 2041 IDS_FLAGS_ARC_BOOT_COMPLETED_DESCRIPTION, kOsCrOS,
2043 FEATURE_VALUE_TYPE(arc::kBootCompletedBroadcastFeature)}, 2042 FEATURE_VALUE_TYPE(arc::kBootCompletedBroadcastFeature)},
2044 #endif // OS_CHROMEOS 2043 #endif // OS_CHROMEOS
2045 {"saveas-menu-text-experiment", IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_NAME, 2044 {"saveas-menu-text-experiment", IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_NAME,
2046 IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_DESCRIPTION, kOsDesktop, 2045 IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_DESCRIPTION, kOsDesktop,
2047 SINGLE_VALUE_TYPE(switches::kEnableSaveAsMenuLabelExperiment)}, 2046 SINGLE_VALUE_TYPE(switches::kEnableSaveAsMenuLabelExperiment)},
2048 {"enable-generic-sensor", IDS_FLAGS_ENABLE_GENERIC_SENSOR_NAME, 2047 {"enable-generic-sensor", IDS_FLAGS_ENABLE_GENERIC_SENSOR_NAME,
2049 IDS_FLAGS_ENABLE_GENERIC_SENSOR_DESCRIPTION, kOsAndroid | kOsMac | kOsWin, 2048 IDS_FLAGS_ENABLE_GENERIC_SENSOR_DESCRIPTION, kOsAll,
2050 FEATURE_VALUE_TYPE(features::kGenericSensor)}, 2049 FEATURE_VALUE_TYPE(features::kGenericSensor)},
2051 {"expensive-background-timer-throttling", 2050 {"expensive-background-timer-throttling",
2052 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_NAME, 2051 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_NAME,
2053 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_DESCRIPTION, kOsAll, 2052 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_DESCRIPTION, kOsAll,
2054 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)}, 2053 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)},
2055 {"security-chip", IDS_FLAGS_SECURITY_CHIP_NAME, 2054 {"security-chip", IDS_FLAGS_SECURITY_CHIP_NAME,
2056 IDS_FLAGS_SECURITY_CHIP_DESCRIPTION, kOsDesktop, 2055 IDS_FLAGS_SECURITY_CHIP_DESCRIPTION, kOsDesktop,
2057 MULTI_VALUE_TYPE(kSecurityChipChoices)}, 2056 MULTI_VALUE_TYPE(kSecurityChipChoices)},
2058 {"security-chip-animation", IDS_FLAGS_SECURITY_CHIP_ANIMATION_NAME, 2057 {"security-chip-animation", IDS_FLAGS_SECURITY_CHIP_ANIMATION_NAME,
2059 IDS_FLAGS_SECURITY_CHIP_ANIMATION_DESCRIPTION, kOsDesktop, 2058 IDS_FLAGS_SECURITY_CHIP_ANIMATION_DESCRIPTION, kOsDesktop,
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
2294 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2293 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2295 2294
2296 const FeatureEntry* GetFeatureEntries(size_t* count) { 2295 const FeatureEntry* GetFeatureEntries(size_t* count) {
2297 *count = arraysize(kFeatureEntries); 2296 *count = arraysize(kFeatureEntries);
2298 return kFeatureEntries; 2297 return kFeatureEntries;
2299 } 2298 }
2300 2299
2301 } // namespace testing 2300 } // namespace testing
2302 2301
2303 } // namespace about_flags 2302 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698