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

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

Issue 1450213002: Enable PrivetV3Session without checking command line flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@context7
Patch Set: Created 5 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
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 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME, 1305 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME,
1306 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION, 1306 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION,
1307 kOsDesktop, 1307 kOsDesktop,
1308 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications, 1308 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications,
1309 switches::kDisableDeviceDiscoveryNotifications)}, 1309 switches::kDisableDeviceDiscoveryNotifications)},
1310 {"enable-print-preview-register-promos", 1310 {"enable-print-preview-register-promos",
1311 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME, 1311 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME,
1312 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION, 1312 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION,
1313 kOsDesktop, 1313 kOsDesktop,
1314 SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)}, 1314 SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)},
1315 {"enable-privet-v3",
1316 IDS_FLAGS_ENABLE_WEAVE_PAIRING_NAME,
1317 IDS_FLAGS_ENABLE_WEAVE_PAIRING_DESCRIPTION,
1318 kOsDesktop,
1319 SINGLE_VALUE_TYPE(switches::kEnablePrivetV3)},
1320 #endif // ENABLE_SERVICE_DISCOVERY 1315 #endif // ENABLE_SERVICE_DISCOVERY
1321 #if defined(ENABLE_PRINT_PREVIEW) 1316 #if defined(ENABLE_PRINT_PREVIEW)
1322 {"enable-print-preview-simplify", 1317 {"enable-print-preview-simplify",
1323 IDS_FLAGS_ENABLE_DISTILLER_IN_PRINT_PREVIEW_NAME, 1318 IDS_FLAGS_ENABLE_DISTILLER_IN_PRINT_PREVIEW_NAME,
1324 IDS_FLAGS_ENABLE_DISTILLER_IN_PRINT_PREVIEW_DESCRIPTION, 1319 IDS_FLAGS_ENABLE_DISTILLER_IN_PRINT_PREVIEW_DESCRIPTION,
1325 kOsDesktop, 1320 kOsDesktop,
1326 FEATURE_VALUE_TYPE(PrintPreviewDistiller::kFeature)}, 1321 FEATURE_VALUE_TYPE(PrintPreviewDistiller::kFeature)},
1327 #endif 1322 #endif
1328 #if defined(OS_WIN) 1323 #if defined(OS_WIN)
1329 {"enable-cloud-print-xps", 1324 {"enable-cloud-print-xps",
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2919 FlagsState::GetInstance()->SetFeatureEntries(entries, count); 2914 FlagsState::GetInstance()->SetFeatureEntries(entries, count);
2920 } 2915 }
2921 2916
2922 const FeatureEntry* GetFeatureEntries(size_t* count) { 2917 const FeatureEntry* GetFeatureEntries(size_t* count) {
2923 return FlagsState::GetInstance()->GetFeatureEntries(count); 2918 return FlagsState::GetInstance()->GetFeatureEntries(count);
2924 } 2919 }
2925 2920
2926 } // namespace testing 2921 } // namespace testing
2927 2922
2928 } // namespace about_flags 2923 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/gcd_private/gcd_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698