Chromium Code Reviews| 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 1963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1974 }, | 1974 }, |
| 1975 #if !defined(OS_ANDROID) | 1975 #if !defined(OS_ANDROID) |
| 1976 { | 1976 { |
| 1977 "enable-message-center-always-scroll-up-upon-notification-removal", | 1977 "enable-message-center-always-scroll-up-upon-notification-removal", |
| 1978 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, | 1978 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |
| 1979 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, | 1979 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, |
| 1980 kOsDesktop, | 1980 kOsDesktop, |
| 1981 SINGLE_VALUE_TYPE( | 1981 SINGLE_VALUE_TYPE( |
| 1982 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval) | 1982 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval) |
| 1983 }, | 1983 }, |
| 1984 { | |
| 1985 "enable-material-design-settings", | |
|
James Hawkins
2015/02/03 22:08:46
Let's shorten this to enable-md-settings.
Oren Blasberg
2015/02/03 22:13:34
Done.
| |
| 1986 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_NAME, | |
| 1987 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_DESCRIPTION, | |
| 1988 kOsDesktop, | |
| 1989 SINGLE_VALUE_TYPE( | |
| 1990 switches::kEnableMaterialDesignSettings) | |
| 1991 }, | |
| 1984 #endif | 1992 #endif |
| 1985 #if defined(OS_CHROMEOS) | 1993 #if defined(OS_CHROMEOS) |
| 1986 { | 1994 { |
| 1987 "disable-memory-pressure-chromeos", | 1995 "disable-memory-pressure-chromeos", |
| 1988 IDS_FLAGS_DISABLE_MEMORY_PRESSURE_NAME, | 1996 IDS_FLAGS_DISABLE_MEMORY_PRESSURE_NAME, |
| 1989 IDS_FLAGS_DISABLE_MEMORY_PRESSURE_DESCRIPTION, | 1997 IDS_FLAGS_DISABLE_MEMORY_PRESSURE_DESCRIPTION, |
| 1990 kOsCrOS, | 1998 kOsCrOS, |
| 1991 SINGLE_VALUE_TYPE(chromeos::switches::kDisableMemoryPressureSystemChromeOS) | 1999 SINGLE_VALUE_TYPE(chromeos::switches::kDisableMemoryPressureSystemChromeOS) |
| 1992 }, | 2000 }, |
| 1993 { | 2001 { |
| (...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2727 } | 2735 } |
| 2728 | 2736 |
| 2729 const Experiment* GetExperiments(size_t* count) { | 2737 const Experiment* GetExperiments(size_t* count) { |
| 2730 *count = num_experiments; | 2738 *count = num_experiments; |
| 2731 return experiments; | 2739 return experiments; |
| 2732 } | 2740 } |
| 2733 | 2741 |
| 2734 } // namespace testing | 2742 } // namespace testing |
| 2735 | 2743 |
| 2736 } // namespace about_flags | 2744 } // namespace about_flags |
| OLD | NEW |