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

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

Issue 2848683003: MD Settings: Add settings-internet-config (WiFi only, no certs) (Closed)
Patch Set: Rebase + Feedback Created 3 years, 7 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 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 flag_descriptions::kTouchAdjustmentDescription, 1315 flag_descriptions::kTouchAdjustmentDescription,
1316 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, 1316 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
1317 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, 1317 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)},
1318 #if defined(OS_CHROMEOS) 1318 #if defined(OS_CHROMEOS)
1319 {"network-portal-notification", 1319 {"network-portal-notification",
1320 flag_descriptions::kNetworkPortalNotificationName, 1320 flag_descriptions::kNetworkPortalNotificationName,
1321 flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS, 1321 flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS,
1322 ENABLE_DISABLE_VALUE_TYPE( 1322 ENABLE_DISABLE_VALUE_TYPE(
1323 chromeos::switches::kEnableNetworkPortalNotification, 1323 chromeos::switches::kEnableNetworkPortalNotification,
1324 chromeos::switches::kDisableNetworkPortalNotification)}, 1324 chromeos::switches::kDisableNetworkPortalNotification)},
1325 {"network-settings-config", flag_descriptions::kNetworkSettingsConfigName,
1326 flag_descriptions::kNetworkSettingsConfigDescription, kOsCrOS,
1327 SINGLE_VALUE_TYPE(chromeos::switches::kNetworkSettingsConfig)},
1325 #endif // OS_CHROMEOS 1328 #endif // OS_CHROMEOS
1326 #if defined(OS_ANDROID) 1329 #if defined(OS_ANDROID)
1327 {"enable-media-document-download-button", 1330 {"enable-media-document-download-button",
1328 flag_descriptions::kMediaDocumentDownloadButtonName, 1331 flag_descriptions::kMediaDocumentDownloadButtonName,
1329 flag_descriptions::kMediaDocumentDownloadButtonDescription, kOsAndroid, 1332 flag_descriptions::kMediaDocumentDownloadButtonDescription, kOsAndroid,
1330 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, 1333 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)},
1331 #endif // OS_ANDROID 1334 #endif // OS_ANDROID
1332 #if BUILDFLAG(ENABLE_PLUGINS) 1335 #if BUILDFLAG(ENABLE_PLUGINS)
1333 {"prefer-html-over-flash", flag_descriptions::kPreferHtmlOverPluginsName, 1336 {"prefer-html-over-flash", flag_descriptions::kPreferHtmlOverPluginsName,
1334 flag_descriptions::kPreferHtmlOverPluginsDescription, kOsDesktop, 1337 flag_descriptions::kPreferHtmlOverPluginsDescription, kOsDesktop,
(...skipping 1887 matching lines...) Expand 10 before | Expand all | Expand 10 after
3222 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3225 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3223 3226
3224 const FeatureEntry* GetFeatureEntries(size_t* count) { 3227 const FeatureEntry* GetFeatureEntries(size_t* count) {
3225 *count = arraysize(kFeatureEntries); 3228 *count = arraysize(kFeatureEntries);
3226 return kFeatureEntries; 3229 return kFeatureEntries;
3227 } 3230 }
3228 3231
3229 } // namespace testing 3232 } // namespace testing
3230 3233
3231 } // namespace about_flags 3234 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698