| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 }, | 408 }, |
| 409 { | 409 { |
| 410 "enable-pointer-lock", | 410 "enable-pointer-lock", |
| 411 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME, | 411 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME, |
| 412 IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION, | 412 IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION, |
| 413 kOsAll, | 413 kOsAll, |
| 414 SINGLE_VALUE_TYPE(switches::kEnablePointerLock) | 414 SINGLE_VALUE_TYPE(switches::kEnablePointerLock) |
| 415 }, | 415 }, |
| 416 #if defined(USE_AURA) | 416 #if defined(USE_AURA) |
| 417 { | 417 { |
| 418 "aura-windows", | 418 "aura-constrained-windows", |
| 419 IDS_FLAGS_AURA_WINDOWS_NAME, | 419 IDS_FLAGS_AURA_CONSTRAINED_WINDOWS_NAME, |
| 420 IDS_FLAGS_AURA_WINDOWS_DESCRIPTION, | 420 IDS_FLAGS_AURA_CONSTRAINED_WINDOWS_DESCRIPTION, |
| 421 kOsWin | kOsLinux | kOsCrOS, | 421 kOsWin | kOsLinux | kOsCrOS, |
| 422 SINGLE_VALUE_TYPE(switches::kAuraWindows) | 422 SINGLE_VALUE_TYPE(switches::kAuraConstrainedWindows) |
| 423 }, | 423 }, |
| 424 #endif | 424 { |
| 425 "aura-translucent-frames", |
| 426 IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_NAME, |
| 427 IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_DESCRIPTION, |
| 428 kOsWin | kOsLinux | kOsCrOS, |
| 429 SINGLE_VALUE_TYPE(switches::kAuraTranslucentFrames) |
| 430 }, |
| 431 #endif // defined(USE_AURA) |
| 425 { | 432 { |
| 426 "enable-gamepad", | 433 "enable-gamepad", |
| 427 IDS_FLAGS_ENABLE_GAMEPAD_NAME, | 434 IDS_FLAGS_ENABLE_GAMEPAD_NAME, |
| 428 IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION, | 435 IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION, |
| 429 kOsMac | kOsWin, | 436 kOsMac | kOsWin, |
| 430 SINGLE_VALUE_TYPE(switches::kEnableGamepad) | 437 SINGLE_VALUE_TYPE(switches::kEnableGamepad) |
| 431 }, | 438 }, |
| 432 }; | 439 }; |
| 433 | 440 |
| 434 const Experiment* experiments = kExperiments; | 441 const Experiment* experiments = kExperiments; |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 } | 858 } |
| 852 | 859 |
| 853 const Experiment* GetExperiments(size_t* count) { | 860 const Experiment* GetExperiments(size_t* count) { |
| 854 *count = num_experiments; | 861 *count = num_experiments; |
| 855 return experiments; | 862 return experiments; |
| 856 } | 863 } |
| 857 | 864 |
| 858 } // namespace testing | 865 } // namespace testing |
| 859 | 866 |
| 860 } // namespace about_flags | 867 } // namespace about_flags |
| OLD | NEW |