| 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 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1514 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, | 1514 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, |
| 1515 kOsAndroid, | 1515 kOsAndroid, |
| 1516 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) | 1516 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) |
| 1517 }, | 1517 }, |
| 1518 #endif | 1518 #endif |
| 1519 #if defined(ENABLE_GOOGLE_NOW) | 1519 #if defined(ENABLE_GOOGLE_NOW) |
| 1520 { | 1520 { |
| 1521 "enable-google-now", | 1521 "enable-google-now", |
| 1522 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, | 1522 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, |
| 1523 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, | 1523 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, |
| 1524 kOsWin | kOsCrOS | kOsMac, | 1524 kOsDesktop, |
| 1525 ENABLE_DISABLE_VALUE_TYPE( | 1525 ENABLE_DISABLE_VALUE_TYPE( |
| 1526 switches::kEnableGoogleNowIntegration, | 1526 switches::kEnableGoogleNowIntegration, |
| 1527 switches::kDisableGoogleNowIntegration) | 1527 switches::kDisableGoogleNowIntegration) |
| 1528 }, | 1528 }, |
| 1529 #endif | 1529 #endif |
| 1530 #if defined(OS_CHROMEOS) | 1530 #if defined(OS_CHROMEOS) |
| 1531 { | 1531 { |
| 1532 "enable-virtual-keyboard", | 1532 "enable-virtual-keyboard", |
| 1533 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, | 1533 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
| 1534 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, | 1534 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
| (...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2489 } | 2489 } |
| 2490 | 2490 |
| 2491 const Experiment* GetExperiments(size_t* count) { | 2491 const Experiment* GetExperiments(size_t* count) { |
| 2492 *count = num_experiments; | 2492 *count = num_experiments; |
| 2493 return experiments; | 2493 return experiments; |
| 2494 } | 2494 } |
| 2495 | 2495 |
| 2496 } // namespace testing | 2496 } // namespace testing |
| 2497 | 2497 |
| 2498 } // namespace about_flags | 2498 } // namespace about_flags |
| OLD | NEW |