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