| 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 18 matching lines...) Expand all Loading... |
| 29 #include "media/base/media_switches.h" | 29 #include "media/base/media_switches.h" |
| 30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| 31 #include "ui/base/ui_base_switches.h" | 31 #include "ui/base/ui_base_switches.h" |
| 32 #include "ui/compositor/compositor_switches.h" | 32 #include "ui/compositor/compositor_switches.h" |
| 33 #include "ui/events/event_switches.h" | 33 #include "ui/events/event_switches.h" |
| 34 #include "ui/gfx/switches.h" | 34 #include "ui/gfx/switches.h" |
| 35 #include "ui/gl/gl_switches.h" | 35 #include "ui/gl/gl_switches.h" |
| 36 #include "ui/keyboard/keyboard_switches.h" | 36 #include "ui/keyboard/keyboard_switches.h" |
| 37 #include "ui/message_center/message_center_switches.h" | 37 #include "ui/message_center/message_center_switches.h" |
| 38 #include "ui/surface/surface_switches.h" | 38 #include "ui/surface/surface_switches.h" |
| 39 #include "ui/views/views_switches.h" |
| 39 | 40 |
| 40 #if defined(USE_ASH) | 41 #if defined(USE_ASH) |
| 41 #include "ash/ash_switches.h" | 42 #include "ash/ash_switches.h" |
| 42 #endif | 43 #endif |
| 43 | 44 |
| 44 #if defined(OS_CHROMEOS) | 45 #if defined(OS_CHROMEOS) |
| 45 #include "chromeos/chromeos_switches.h" | 46 #include "chromeos/chromeos_switches.h" |
| 46 #include "third_party/cros_system_api/switches/chrome_switches.h" | 47 #include "third_party/cros_system_api/switches/chrome_switches.h" |
| 47 #endif | 48 #endif |
| 48 | 49 |
| (...skipping 1780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1829 SINGLE_VALUE_TYPE(chromeos::switches::kEnableIMEModeIndicator) | 1830 SINGLE_VALUE_TYPE(chromeos::switches::kEnableIMEModeIndicator) |
| 1830 }, | 1831 }, |
| 1831 #endif | 1832 #endif |
| 1832 { | 1833 { |
| 1833 "enable-translate-new-ux", | 1834 "enable-translate-new-ux", |
| 1834 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, | 1835 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, |
| 1835 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, | 1836 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, |
| 1836 kOsDesktop, | 1837 kOsDesktop, |
| 1837 SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) | 1838 SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) |
| 1838 }, | 1839 }, |
| 1840 #if defined(TOOLKIT_VIEWS) |
| 1841 { |
| 1842 "views-use-rect-based-targeting", // FLAGS:RECORD_UMA |
| 1843 IDS_FLAGS_VIEWS_USE_RECT_BASED_TARGETING_NAME, |
| 1844 IDS_FLAGS_VIEWS_USE_RECT_BASED_TARGETING_DESCRIPTION, |
| 1845 kOsCrOS | kOsWin, |
| 1846 SINGLE_VALUE_TYPE(views::switches::kViewsUseRectBasedTargeting) |
| 1847 }, |
| 1848 #endif |
| 1839 }; | 1849 }; |
| 1840 | 1850 |
| 1841 const Experiment* experiments = kExperiments; | 1851 const Experiment* experiments = kExperiments; |
| 1842 size_t num_experiments = arraysize(kExperiments); | 1852 size_t num_experiments = arraysize(kExperiments); |
| 1843 | 1853 |
| 1844 // Stores and encapsulates the little state that about:flags has. | 1854 // Stores and encapsulates the little state that about:flags has. |
| 1845 class FlagsState { | 1855 class FlagsState { |
| 1846 public: | 1856 public: |
| 1847 FlagsState() : needs_restart_(false) {} | 1857 FlagsState() : needs_restart_(false) {} |
| 1848 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1858 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2329 } | 2339 } |
| 2330 | 2340 |
| 2331 const Experiment* GetExperiments(size_t* count) { | 2341 const Experiment* GetExperiments(size_t* count) { |
| 2332 *count = num_experiments; | 2342 *count = num_experiments; |
| 2333 return experiments; | 2343 return experiments; |
| 2334 } | 2344 } |
| 2335 | 2345 |
| 2336 } // namespace testing | 2346 } // namespace testing |
| 2337 | 2347 |
| 2338 } // namespace about_flags | 2348 } // namespace about_flags |
| OLD | NEW |