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

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

Issue 2848683003: MD Settings: Add settings-internet-config (WiFi only, no certs) (Closed)
Patch Set: Feedback, add network-confg-input + select 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 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 flag_descriptions::kTouchAdjustmentDescription, 1279 flag_descriptions::kTouchAdjustmentDescription,
1280 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, 1280 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
1281 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, 1281 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)},
1282 #if defined(OS_CHROMEOS) 1282 #if defined(OS_CHROMEOS)
1283 {"network-portal-notification", 1283 {"network-portal-notification",
1284 flag_descriptions::kNetworkPortalNotificationName, 1284 flag_descriptions::kNetworkPortalNotificationName,
1285 flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS, 1285 flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS,
1286 ENABLE_DISABLE_VALUE_TYPE( 1286 ENABLE_DISABLE_VALUE_TYPE(
1287 chromeos::switches::kEnableNetworkPortalNotification, 1287 chromeos::switches::kEnableNetworkPortalNotification,
1288 chromeos::switches::kDisableNetworkPortalNotification)}, 1288 chromeos::switches::kDisableNetworkPortalNotification)},
1289 {"network-settings-config", flag_descriptions::kNetworkSettingsConfigName,
1290 flag_descriptions::kNetworkSettingsConfigDescription, kOsCrOS,
1291 SINGLE_VALUE_TYPE(chromeos::switches::kNetworkSettingsConfig)},
1289 #endif // OS_CHROMEOS 1292 #endif // OS_CHROMEOS
1290 #if defined(OS_ANDROID) 1293 #if defined(OS_ANDROID)
1291 {"enable-media-document-download-button", 1294 {"enable-media-document-download-button",
1292 flag_descriptions::kMediaDocumentDownloadButtonName, 1295 flag_descriptions::kMediaDocumentDownloadButtonName,
1293 flag_descriptions::kMediaDocumentDownloadButtonDescription, kOsAndroid, 1296 flag_descriptions::kMediaDocumentDownloadButtonDescription, kOsAndroid,
1294 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, 1297 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)},
1295 #endif // OS_ANDROID 1298 #endif // OS_ANDROID
1296 #if BUILDFLAG(ENABLE_PLUGINS) 1299 #if BUILDFLAG(ENABLE_PLUGINS)
1297 {"prefer-html-over-flash", flag_descriptions::kPreferHtmlOverPluginsName, 1300 {"prefer-html-over-flash", flag_descriptions::kPreferHtmlOverPluginsName,
1298 flag_descriptions::kPreferHtmlOverPluginsDescription, kOsDesktop, 1301 flag_descriptions::kPreferHtmlOverPluginsDescription, kOsDesktop,
(...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after
3168 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3171 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3169 3172
3170 const FeatureEntry* GetFeatureEntries(size_t* count) { 3173 const FeatureEntry* GetFeatureEntries(size_t* count) {
3171 *count = arraysize(kFeatureEntries); 3174 *count = arraysize(kFeatureEntries);
3172 return kFeatureEntries; 3175 return kFeatureEntries;
3173 } 3176 }
3174 3177
3175 } // namespace testing 3178 } // namespace testing
3176 3179
3177 } // namespace about_flags 3180 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698