| 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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) | 605 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
| 606 }, | 606 }, |
| 607 #if defined(USE_ASH) | 607 #if defined(USE_ASH) |
| 608 { | 608 { |
| 609 "aura-google-dialog-frames", | 609 "aura-google-dialog-frames", |
| 610 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, | 610 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, |
| 611 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, | 611 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, |
| 612 kOsWin | kOsLinux | kOsCrOS, | 612 kOsWin | kOsLinux | kOsCrOS, |
| 613 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) | 613 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) |
| 614 }, | 614 }, |
| 615 { |
| 616 "ash-disable-auto-window-placement", |
| 617 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME, |
| 618 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION, |
| 619 kOsWin | kOsLinux | kOsCrOS, |
| 620 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement) |
| 621 }, |
| 615 #endif | 622 #endif |
| 616 { | 623 { |
| 617 "per-tile-painting", | 624 "per-tile-painting", |
| 618 IDS_FLAGS_PER_TILE_PAINTING_NAME, | 625 IDS_FLAGS_PER_TILE_PAINTING_NAME, |
| 619 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, | 626 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, |
| 620 #if defined(USE_SKIA) | 627 #if defined(USE_SKIA) |
| 621 kOsMac | kOsLinux | kOsCrOS, | 628 kOsMac | kOsLinux | kOsCrOS, |
| 622 #else | 629 #else |
| 623 0, | 630 0, |
| 624 #endif | 631 #endif |
| (...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1435 } | 1442 } |
| 1436 | 1443 |
| 1437 const Experiment* GetExperiments(size_t* count) { | 1444 const Experiment* GetExperiments(size_t* count) { |
| 1438 *count = num_experiments; | 1445 *count = num_experiments; |
| 1439 return experiments; | 1446 return experiments; |
| 1440 } | 1447 } |
| 1441 | 1448 |
| 1442 } // namespace testing | 1449 } // namespace testing |
| 1443 | 1450 |
| 1444 } // namespace about_flags | 1451 } // namespace about_flags |
| OLD | NEW |