| 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 <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1923 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList, | 1923 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList, |
| 1924 app_list::switches::kDisableExperimentalAppList) | 1924 app_list::switches::kDisableExperimentalAppList) |
| 1925 }, | 1925 }, |
| 1926 { | 1926 { |
| 1927 "enable-centered-app-list", | 1927 "enable-centered-app-list", |
| 1928 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME, | 1928 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME, |
| 1929 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, | 1929 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, |
| 1930 kOsWin | kOsLinux | kOsCrOS, | 1930 kOsWin | kOsLinux | kOsCrOS, |
| 1931 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList) | 1931 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList) |
| 1932 }, | 1932 }, |
| 1933 { |
| 1934 "enable-new-app-list-mixer", |
| 1935 IDS_FLAGS_ENABLE_NEW_APP_LIST_MIXER_NAME, |
| 1936 IDS_FLAGS_ENABLE_NEW_APP_LIST_MIXER_DESCRIPTION, |
| 1937 kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| 1938 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableNewAppListMixer, |
| 1939 app_list::switches::kDisableNewAppListMixer) |
| 1940 }, |
| 1933 #endif | 1941 #endif |
| 1934 { | 1942 { |
| 1935 "disable-threaded-scrolling", | 1943 "disable-threaded-scrolling", |
| 1936 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, | 1944 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, |
| 1937 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, | 1945 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, |
| 1938 kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac, | 1946 kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac, |
| 1939 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) | 1947 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) |
| 1940 }, | 1948 }, |
| 1941 { | 1949 { |
| 1942 "bleeding-edge-renderer-mode", | 1950 "bleeding-edge-renderer-mode", |
| (...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3043 } | 3051 } |
| 3044 | 3052 |
| 3045 const Experiment* GetExperiments(size_t* count) { | 3053 const Experiment* GetExperiments(size_t* count) { |
| 3046 *count = num_experiments; | 3054 *count = num_experiments; |
| 3047 return experiments; | 3055 return experiments; |
| 3048 } | 3056 } |
| 3049 | 3057 |
| 3050 } // namespace testing | 3058 } // namespace testing |
| 3051 | 3059 |
| 3052 } // namespace about_flags | 3060 } // namespace about_flags |
| OLD | NEW |