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 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1501 kOsAndroid, | 1501 kOsAndroid, |
1502 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) | 1502 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) |
1503 }, | 1503 }, |
1504 #endif | 1504 #endif |
1505 #if defined(ENABLE_GOOGLE_NOW) | 1505 #if defined(ENABLE_GOOGLE_NOW) |
1506 { | 1506 { |
1507 "enable-google-now", | 1507 "enable-google-now", |
1508 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, | 1508 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, |
1509 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, | 1509 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, |
1510 kOsWin | kOsCrOS | kOsMac, | 1510 kOsWin | kOsCrOS | kOsMac, |
1511 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) | 1511 ENABLE_DISABLE_VALUE_TYPE( |
| 1512 switches::kEnableGoogleNowIntegration, |
| 1513 switches::kDisableGoogleNowIntegration) |
1512 }, | 1514 }, |
1513 #endif | 1515 #endif |
1514 #if defined(OS_CHROMEOS) | 1516 #if defined(OS_CHROMEOS) |
1515 { | 1517 { |
1516 "enable-virtual-keyboard", | 1518 "enable-virtual-keyboard", |
1517 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, | 1519 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
1518 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, | 1520 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
1519 kOsCrOS, | 1521 kOsCrOS, |
1520 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) | 1522 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) |
1521 }, | 1523 }, |
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2289 } | 2291 } |
2290 | 2292 |
2291 const Experiment* GetExperiments(size_t* count) { | 2293 const Experiment* GetExperiments(size_t* count) { |
2292 *count = num_experiments; | 2294 *count = num_experiments; |
2293 return experiments; | 2295 return experiments; |
2294 } | 2296 } |
2295 | 2297 |
2296 } // namespace testing | 2298 } // namespace testing |
2297 | 2299 |
2298 } // namespace about_flags | 2300 } // namespace about_flags |
OLD | NEW |