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

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

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/browser_resources.grd » ('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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 kOsMac, 1395 kOsMac,
1396 SINGLE_VALUE_TYPE(switches::kAppsUseNativeFrame) 1396 SINGLE_VALUE_TYPE(switches::kAppsUseNativeFrame)
1397 }, 1397 },
1398 { 1398 {
1399 "enable-syncfs-directory-operation", 1399 "enable-syncfs-directory-operation",
1400 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_NAME, 1400 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_NAME,
1401 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_DESCRIPTION, 1401 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_DESCRIPTION,
1402 kOsAll, 1402 kOsAll,
1403 SINGLE_VALUE_TYPE(switches::kSyncfsEnableDirectoryOperation), 1403 SINGLE_VALUE_TYPE(switches::kSyncfsEnableDirectoryOperation),
1404 }, 1404 },
1405 #if defined(ENABLE_MDNS) 1405 #if defined(ENABLE_SERVICE_DISCOVERY)
1406 { 1406 {
1407 "disable-device-discovery", 1407 "disable-device-discovery",
1408 IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_NAME, 1408 IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_NAME,
1409 IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_DESCRIPTION, 1409 IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_DESCRIPTION,
1410 kOsWin | kOsLinux | kOsCrOS, 1410 kOsWin | kOsLinux | kOsCrOS,
1411 SINGLE_VALUE_TYPE(switches::kDisableDeviceDiscovery) 1411 SINGLE_VALUE_TYPE(switches::kDisableDeviceDiscovery)
1412 }, 1412 },
1413 { 1413 {
1414 "device-discovery-notifications", 1414 "device-discovery-notifications",
1415 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME, 1415 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME,
1416 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION, 1416 IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION,
1417 kOsWin | kOsLinux | kOsCrOS, 1417 kOsWin | kOsLinux | kOsCrOS,
1418 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications, 1418 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications,
1419 switches::kDisableDeviceDiscoveryNotifications) 1419 switches::kDisableDeviceDiscoveryNotifications)
1420 }, 1420 },
1421 { 1421 {
1422 "enable-print-preview-register-promos", 1422 "enable-print-preview-register-promos",
1423 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME, 1423 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME,
1424 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION, 1424 IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION,
1425 kOsWin | kOsLinux | kOsCrOS, 1425 kOsWin | kOsLinux | kOsCrOS,
1426 SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos) 1426 SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)
1427 }, 1427 },
1428 #endif // ENABLE_MDNS 1428 #endif // ENABLE_SERVICE_DISCOVERY
1429 #if defined(OS_WIN) 1429 #if defined(OS_WIN)
1430 { 1430 {
1431 "enable-cloud-print-xps", 1431 "enable-cloud-print-xps",
1432 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME, 1432 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME,
1433 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_DESCRIPTION, 1433 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_DESCRIPTION,
1434 kOsWin, 1434 kOsWin,
1435 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps) 1435 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)
1436 }, 1436 },
1437 #endif 1437 #endif
1438 #if defined(OS_MACOSX) 1438 #if defined(OS_MACOSX)
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
2368 } 2368 }
2369 2369
2370 const Experiment* GetExperiments(size_t* count) { 2370 const Experiment* GetExperiments(size_t* count) {
2371 *count = num_experiments; 2371 *count = num_experiments;
2372 return experiments; 2372 return experiments;
2373 } 2373 }
2374 2374
2375 } // namespace testing 2375 } // namespace testing
2376 2376
2377 } // namespace about_flags 2377 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698