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 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 kOsWin | kOsCrOS, | 690 kOsWin | kOsCrOS, |
691 MULTI_VALUE_TYPE(kTouchOptimizedUIChoices) | 691 MULTI_VALUE_TYPE(kTouchOptimizedUIChoices) |
692 }, | 692 }, |
693 { | 693 { |
694 "enable-touch-events", | 694 "enable-touch-events", |
695 IDS_ENABLE_TOUCH_EVENTS_NAME, | 695 IDS_ENABLE_TOUCH_EVENTS_NAME, |
696 IDS_ENABLE_TOUCH_EVENTS_DESCRIPTION, | 696 IDS_ENABLE_TOUCH_EVENTS_DESCRIPTION, |
697 kOsAll, | 697 kOsAll, |
698 SINGLE_VALUE_TYPE(switches::kEnableTouchEvents) | 698 SINGLE_VALUE_TYPE(switches::kEnableTouchEvents) |
699 }, | 699 }, |
| 700 { |
| 701 "enable-touch-radial-menu", |
| 702 IDS_FLAGS_TOUCH_RADIAL_MENU_UI_NAME, |
| 703 IDS_FLAGS_TOUCH_RADIAL_MENU_UI_DESCRIPTION, |
| 704 kOsCrOS, |
| 705 SINGLE_VALUE_TYPE(switches::kEnableTouchRadialMenu) |
| 706 }, |
700 #if defined(OS_CHROMEOS) | 707 #if defined(OS_CHROMEOS) |
701 { | 708 { |
702 "no-discard-tabs", | 709 "no-discard-tabs", |
703 IDS_FLAGS_NO_DISCARD_TABS_NAME, | 710 IDS_FLAGS_NO_DISCARD_TABS_NAME, |
704 IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION, | 711 IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION, |
705 kOsCrOS, | 712 kOsCrOS, |
706 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs) | 713 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs) |
707 }, | 714 }, |
708 #endif | 715 #endif |
709 { | 716 { |
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1298 } | 1305 } |
1299 | 1306 |
1300 const Experiment* GetExperiments(size_t* count) { | 1307 const Experiment* GetExperiments(size_t* count) { |
1301 *count = num_experiments; | 1308 *count = num_experiments; |
1302 return experiments; | 1309 return experiments; |
1303 } | 1310 } |
1304 | 1311 |
1305 } // namespace testing | 1312 } // namespace testing |
1306 | 1313 |
1307 } // namespace about_flags | 1314 } // namespace about_flags |
OLD | NEW |