| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1523 }, | 1523 }, |
| 1524 #endif | 1524 #endif |
| 1525 { | 1525 { |
| 1526 "disable-app-list-voice-search", | 1526 "disable-app-list-voice-search", |
| 1527 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, | 1527 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, |
| 1528 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, | 1528 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, |
| 1529 kOsCrOS, | 1529 kOsCrOS, |
| 1530 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch) | 1530 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch) |
| 1531 }, | 1531 }, |
| 1532 { | 1532 { |
| 1533 "enable-app-list-hotword-always-on", | |
| 1534 IDS_FLAGS_ENABLE_APP_LIST_HOTWORD_ALWAYS_ON, | |
| 1535 IDS_FLAGS_ENABLE_APP_LIST_HOTWORD_ALWAYS_ON_DESCRIPTION, | |
| 1536 kOsCrOS, | |
| 1537 SINGLE_VALUE_TYPE(app_list::switches::kEnableHotwordAlwaysOn) | |
| 1538 }, | |
| 1539 { | |
| 1540 "enable-app-list-app-info", | 1533 "enable-app-list-app-info", |
| 1541 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST, | 1534 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST, |
| 1542 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, | 1535 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, |
| 1543 kOsLinux | kOsWin | kOsCrOS, | 1536 kOsLinux | kOsWin | kOsCrOS, |
| 1544 SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo) | 1537 SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo) |
| 1545 }, | 1538 }, |
| 1546 #endif | 1539 #endif |
| 1547 #if defined(OS_CHROMEOS) | 1540 #if defined(OS_CHROMEOS) |
| 1548 { | 1541 { |
| 1549 "disable-user-image-sync", | 1542 "disable-user-image-sync", |
| (...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2365 } | 2358 } |
| 2366 | 2359 |
| 2367 const Experiment* GetExperiments(size_t* count) { | 2360 const Experiment* GetExperiments(size_t* count) { |
| 2368 *count = num_experiments; | 2361 *count = num_experiments; |
| 2369 return experiments; | 2362 return experiments; |
| 2370 } | 2363 } |
| 2371 | 2364 |
| 2372 } // namespace testing | 2365 } // namespace testing |
| 2373 | 2366 |
| 2374 } // namespace about_flags | 2367 } // namespace about_flags |
| OLD | NEW |