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

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

Issue 1849133006: Revert "ChromeOS: Add SystemTimezoneAutomaticDetection policy." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 1808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 password_manager::features::kProtectSyncCredentialOnReauth)}, 1819 password_manager::features::kProtectSyncCredentialOnReauth)},
1820 #if defined(OS_CHROMEOS) 1820 #if defined(OS_CHROMEOS)
1821 {"enable-experimental-accessibility-features", 1821 {"enable-experimental-accessibility-features",
1822 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME, 1822 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME,
1823 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS, 1823 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS,
1824 SINGLE_VALUE_TYPE( 1824 SINGLE_VALUE_TYPE(
1825 chromeos::switches::kEnableExperimentalAccessibilityFeatures)}, 1825 chromeos::switches::kEnableExperimentalAccessibilityFeatures)},
1826 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME, 1826 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME,
1827 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS, 1827 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS,
1828 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, 1828 FEATURE_VALUE_TYPE(features::kOptInImeMenu)},
1829 {"enable-system-timezone-automatic-detection",
1830 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_NAME,
1831 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_DESCRIPTION, kOsCrOS,
1832 SINGLE_VALUE_TYPE(
1833 chromeos::switches::kEnableSystemTimezoneAutomaticDetectionPolicy)},
1834 #endif 1829 #endif
1835 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) 1830 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD)
1836 {"enable-google-branded-context-menu", 1831 {"enable-google-branded-context-menu",
1837 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, 1832 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME,
1838 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, 1833 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop,
1839 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 1834 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
1840 #endif 1835 #endif
1841 // NOTE: Adding new command-line switches requires adding corresponding 1836 // NOTE: Adding new command-line switches requires adding corresponding
1842 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1837 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1843 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1838 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
2030 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2025 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2031 2026
2032 const FeatureEntry* GetFeatureEntries(size_t* count) { 2027 const FeatureEntry* GetFeatureEntries(size_t* count) {
2033 *count = arraysize(kFeatureEntries); 2028 *count = arraysize(kFeatureEntries);
2034 return kFeatureEntries; 2029 return kFeatureEntries;
2035 } 2030 }
2036 2031
2037 } // namespace testing 2032 } // namespace testing
2038 2033
2039 } // namespace about_flags 2034 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698