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 10 matching lines...) Expand all Loading... |
21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
23 #include "content/public/browser/user_metrics.h" | 23 #include "content/public/browser/user_metrics.h" |
24 #include "grit/chromium_strings.h" | 24 #include "grit/chromium_strings.h" |
25 #include "grit/generated_resources.h" | 25 #include "grit/generated_resources.h" |
26 #include "grit/google_chrome_strings.h" | 26 #include "grit/google_chrome_strings.h" |
27 #include "media/base/media_switches.h" | 27 #include "media/base/media_switches.h" |
28 #include "ui/app_list/app_list_switches.h" | 28 #include "ui/app_list/app_list_switches.h" |
29 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
30 #include "ui/base/ui_base_switches.h" | 30 #include "ui/base/ui_base_switches.h" |
| 31 #include "ui/gfx/switches.h" |
31 #include "ui/gl/gl_switches.h" | 32 #include "ui/gl/gl_switches.h" |
32 | 33 |
33 #if defined(USE_ASH) | 34 #if defined(USE_ASH) |
34 #include "ash/ash_switches.h" | 35 #include "ash/ash_switches.h" |
35 #endif | 36 #endif |
36 | 37 |
37 #if defined(USE_AURA) | 38 #if defined(USE_AURA) |
38 #include "ui/aura/aura_switches.h" | 39 #include "ui/aura/aura_switches.h" |
39 #endif | 40 #endif |
40 | 41 |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
744 IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME, | 745 IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME, |
745 IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION, | 746 IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION, |
746 kOsWin, | 747 kOsWin, |
747 MULTI_VALUE_TYPE(kTouchOptimizedUIChoices) | 748 MULTI_VALUE_TYPE(kTouchOptimizedUIChoices) |
748 }, | 749 }, |
749 { | 750 { |
750 "enable-webkit-text-subpixel-positioning", | 751 "enable-webkit-text-subpixel-positioning", |
751 IDS_FLAGS_ENABLE_WEBKIT_TEXT_SUBPIXEL_POSITIONING_NAME, | 752 IDS_FLAGS_ENABLE_WEBKIT_TEXT_SUBPIXEL_POSITIONING_NAME, |
752 IDS_FLAGS_ENABLE_WEBKIT_TEXT_SUBPIXEL_POSITIONING_DESCRIPTION, | 753 IDS_FLAGS_ENABLE_WEBKIT_TEXT_SUBPIXEL_POSITIONING_DESCRIPTION, |
753 kOsCrOS, | 754 kOsCrOS, |
754 SINGLE_VALUE_TYPE(switches::kEnableWebkitTextSubpixelPositioning) | 755 SINGLE_VALUE_TYPE(gfx::switches::kEnableWebkitTextSubpixelPositioning) |
755 }, | 756 }, |
756 { | 757 { |
757 "enable-touch-events", | 758 "enable-touch-events", |
758 IDS_ENABLE_TOUCH_EVENTS_NAME, | 759 IDS_ENABLE_TOUCH_EVENTS_NAME, |
759 IDS_ENABLE_TOUCH_EVENTS_DESCRIPTION, | 760 IDS_ENABLE_TOUCH_EVENTS_DESCRIPTION, |
760 kOsWin | kOsMac | kOsLinux, | 761 kOsWin | kOsMac | kOsLinux, |
761 SINGLE_VALUE_TYPE(switches::kEnableTouchEvents) | 762 SINGLE_VALUE_TYPE(switches::kEnableTouchEvents) |
762 }, | 763 }, |
763 { | 764 { |
764 "enable-tab-capture", | 765 "enable-tab-capture", |
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1541 } | 1542 } |
1542 | 1543 |
1543 const Experiment* GetExperiments(size_t* count) { | 1544 const Experiment* GetExperiments(size_t* count) { |
1544 *count = num_experiments; | 1545 *count = num_experiments; |
1545 return experiments; | 1546 return experiments; |
1546 } | 1547 } |
1547 | 1548 |
1548 } // namespace testing | 1549 } // namespace testing |
1549 | 1550 |
1550 } // namespace about_flags | 1551 } // namespace about_flags |
OLD | NEW |