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 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1888 SINGLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList) | 1888 SINGLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList) |
1889 }, | 1889 }, |
1890 #endif | 1890 #endif |
1891 { | 1891 { |
1892 "touch-scrolling-mode", | 1892 "touch-scrolling-mode", |
1893 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, | 1893 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, |
1894 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, | 1894 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, |
1895 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 1895 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
1896 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) | 1896 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) |
1897 }, | 1897 }, |
1898 #if defined(USE_AURA) | |
1899 { | |
1900 "new-text-input-focus-handling", | |
msw
2014/03/11 00:58:50
nit: text-input-focus-manager
Yuki
2014/03/11 15:27:37
Done.
| |
1901 IDS_FLAGS_NEW_TEXT_INPUT_FOCUS_HANDLING_NAME, | |
1902 IDS_FLAGS_NEW_TEXT_INPUT_FOCUS_HANDLING_DESCRIPTION, | |
1903 kOsCrOS | kOsLinux | kOsWin, | |
1904 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewTextInputFocus, | |
1905 switches::kDisableNewTextInputFocus) | |
1906 }, | |
1907 #endif | |
1898 }; | 1908 }; |
1899 | 1909 |
1900 const Experiment* experiments = kExperiments; | 1910 const Experiment* experiments = kExperiments; |
1901 size_t num_experiments = arraysize(kExperiments); | 1911 size_t num_experiments = arraysize(kExperiments); |
1902 | 1912 |
1903 // Stores and encapsulates the little state that about:flags has. | 1913 // Stores and encapsulates the little state that about:flags has. |
1904 class FlagsState { | 1914 class FlagsState { |
1905 public: | 1915 public: |
1906 FlagsState() : needs_restart_(false) {} | 1916 FlagsState() : needs_restart_(false) {} |
1907 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1917 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2407 } | 2417 } |
2408 | 2418 |
2409 const Experiment* GetExperiments(size_t* count) { | 2419 const Experiment* GetExperiments(size_t* count) { |
2410 *count = num_experiments; | 2420 *count = num_experiments; |
2411 return experiments; | 2421 return experiments; |
2412 } | 2422 } |
2413 | 2423 |
2414 } // namespace testing | 2424 } // namespace testing |
2415 | 2425 |
2416 } // namespace about_flags | 2426 } // namespace about_flags |
OLD | NEW |