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 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1822 SINGLE_VALUE_TYPE(chromeos::switches::kEnableIMEModeIndicator) | 1823 SINGLE_VALUE_TYPE(chromeos::switches::kEnableIMEModeIndicator) |
1823 }, | 1824 }, |
1824 #endif | 1825 #endif |
1825 { | 1826 { |
1826 "enable-translate-new-ux", | 1827 "enable-translate-new-ux", |
1827 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, | 1828 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, |
1828 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, | 1829 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, |
1829 kOsDesktop, | 1830 kOsDesktop, |
1830 SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) | 1831 SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) |
1831 }, | 1832 }, |
1833 #if defined(OS_CHROMEOS) | |
sky
2013/10/30 14:03:49
This should be TOOLKIT_VIEWS
tdanderson
2013/10/30 20:55:50
Done.
| |
1834 { | |
1835 "views-use-rect-based-targeting", // FLAGS:RECORD_UMA | |
tdanderson
2013/10/29 23:36:57
This is the flag I am landing everything behind. I
| |
1836 IDS_FLAGS_VIEWS_USE_RECT_BASED_TARGETING_NAME, | |
1837 IDS_FLAGS_VIEWS_USE_RECT_BASED_TARGETING_DESCRIPTION, | |
1838 kOsCrOS, | |
1839 SINGLE_VALUE_TYPE(views::switches::kViewsUseRectBasedTargeting) | |
1840 }, | |
1841 #endif | |
1832 }; | 1842 }; |
1833 | 1843 |
1834 const Experiment* experiments = kExperiments; | 1844 const Experiment* experiments = kExperiments; |
1835 size_t num_experiments = arraysize(kExperiments); | 1845 size_t num_experiments = arraysize(kExperiments); |
1836 | 1846 |
1837 // Stores and encapsulates the little state that about:flags has. | 1847 // Stores and encapsulates the little state that about:flags has. |
1838 class FlagsState { | 1848 class FlagsState { |
1839 public: | 1849 public: |
1840 FlagsState() : needs_restart_(false) {} | 1850 FlagsState() : needs_restart_(false) {} |
1841 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1851 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2322 } | 2332 } |
2323 | 2333 |
2324 const Experiment* GetExperiments(size_t* count) { | 2334 const Experiment* GetExperiments(size_t* count) { |
2325 *count = num_experiments; | 2335 *count = num_experiments; |
2326 return experiments; | 2336 return experiments; |
2327 } | 2337 } |
2328 | 2338 |
2329 } // namespace testing | 2339 } // namespace testing |
2330 | 2340 |
2331 } // namespace about_flags | 2341 } // namespace about_flags |
OLD | NEW |