| OLD | NEW |
| 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 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 {"enable-child-account-detection", IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, | 1524 {"enable-child-account-detection", IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, |
| 1525 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, kOsAll, | 1525 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, kOsAll, |
| 1526 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, | 1526 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, |
| 1527 switches::kDisableChildAccountDetection)}, | 1527 switches::kDisableChildAccountDetection)}, |
| 1528 #endif // OS_ANDROID | 1528 #endif // OS_ANDROID |
| 1529 {"v8-pac-mojo-out-of-process", IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, | 1529 {"v8-pac-mojo-out-of-process", IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, |
| 1530 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, kOsDesktop, | 1530 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, kOsDesktop, |
| 1531 ENABLE_DISABLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess, | 1531 ENABLE_DISABLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess, |
| 1532 switches::kDisableOutOfProcessPac)}, | 1532 switches::kDisableOutOfProcessPac)}, |
| 1533 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID) | 1533 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID) |
| 1534 {"media-router", IDS_FLAGS_MEDIA_ROUTER_NAME, | 1534 {"load-media-router-component-extension", |
| 1535 IDS_FLAGS_MEDIA_ROUTER_DESCRIPTION, kOsDesktop, | 1535 IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_NAME, |
| 1536 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kMediaRouter, | 1536 IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_DESCRIPTION, kOsDesktop, |
| 1537 "1", | 1537 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1538 switches::kMediaRouter, | 1538 switches::kLoadMediaRouterComponentExtension, |
| 1539 "0")}, | 1539 "1", |
| 1540 switches::kLoadMediaRouterComponentExtension, |
| 1541 "0")}, |
| 1540 #endif // ENABLE_MEDIA_ROUTER && !OS_ANDROID | 1542 #endif // ENABLE_MEDIA_ROUTER && !OS_ANDROID |
| 1541 // Since Drive Search is not available when app list is disabled, flag guard | 1543 // Since Drive Search is not available when app list is disabled, flag guard |
| 1542 // enable-drive-search-in-chrome-launcher flag. | 1544 // enable-drive-search-in-chrome-launcher flag. |
| 1543 #if BUILDFLAG(ENABLE_APP_LIST) | 1545 #if BUILDFLAG(ENABLE_APP_LIST) |
| 1544 {"enable-drive-search-in-app-launcher", | 1546 {"enable-drive-search-in-app-launcher", |
| 1545 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER, | 1547 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER, |
| 1546 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION, kOsCrOS, | 1548 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION, kOsCrOS, |
| 1547 ENABLE_DISABLE_VALUE_TYPE( | 1549 ENABLE_DISABLE_VALUE_TYPE( |
| 1548 app_list::switches::kEnableDriveSearchInChromeLauncher, | 1550 app_list::switches::kEnableDriveSearchInChromeLauncher, |
| 1549 app_list::switches::kDisableDriveSearchInChromeLauncher)}, | 1551 app_list::switches::kDisableDriveSearchInChromeLauncher)}, |
| (...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2272 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2274 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2273 | 2275 |
| 2274 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2276 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2275 *count = arraysize(kFeatureEntries); | 2277 *count = arraysize(kFeatureEntries); |
| 2276 return kFeatureEntries; | 2278 return kFeatureEntries; |
| 2277 } | 2279 } |
| 2278 | 2280 |
| 2279 } // namespace testing | 2281 } // namespace testing |
| 2280 | 2282 |
| 2281 } // namespace about_flags | 2283 } // namespace about_flags |
| OLD | NEW |