| 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 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) | 602 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
| 603 }, | 603 }, |
| 604 #if defined(USE_ASH) | 604 #if defined(USE_ASH) |
| 605 { | 605 { |
| 606 "aura-google-dialog-frames", | 606 "aura-google-dialog-frames", |
| 607 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, | 607 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, |
| 608 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, | 608 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, |
| 609 kOsWin | kOsLinux | kOsCrOS, | 609 kOsWin | kOsLinux | kOsCrOS, |
| 610 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) | 610 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) |
| 611 }, | 611 }, |
| 612 { |
| 613 "ash-disable-auto-window-placement", |
| 614 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME, |
| 615 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION, |
| 616 kOsWin | kOsLinux | kOsCrOS, |
| 617 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement) |
| 618 }, |
| 612 #endif | 619 #endif |
| 613 { | 620 { |
| 614 "per-tile-painting", | 621 "per-tile-painting", |
| 615 IDS_FLAGS_PER_TILE_PAINTING_NAME, | 622 IDS_FLAGS_PER_TILE_PAINTING_NAME, |
| 616 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, | 623 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, |
| 617 #if defined(USE_SKIA) | 624 #if defined(USE_SKIA) |
| 618 kOsMac | kOsLinux | kOsCrOS, | 625 kOsMac | kOsLinux | kOsCrOS, |
| 619 #else | 626 #else |
| 620 0, | 627 0, |
| 621 #endif | 628 #endif |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1399 } | 1406 } |
| 1400 | 1407 |
| 1401 const Experiment* GetExperiments(size_t* count) { | 1408 const Experiment* GetExperiments(size_t* count) { |
| 1402 *count = num_experiments; | 1409 *count = num_experiments; |
| 1403 return experiments; | 1410 return experiments; |
| 1404 } | 1411 } |
| 1405 | 1412 |
| 1406 } // namespace testing | 1413 } // namespace testing |
| 1407 | 1414 |
| 1408 } // namespace about_flags | 1415 } // namespace about_flags |
| OLD | NEW |