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 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1569 IDS_FLAGS_ENABLE_NEW_APP_LIST_MIXER_DESCRIPTION, | 1569 IDS_FLAGS_ENABLE_NEW_APP_LIST_MIXER_DESCRIPTION, |
1570 kOsWin | kOsLinux | kOsCrOS | kOsMac, | 1570 kOsWin | kOsLinux | kOsCrOS | kOsMac, |
1571 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableNewAppListMixer, | 1571 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableNewAppListMixer, |
1572 app_list::switches::kDisableNewAppListMixer)}, | 1572 app_list::switches::kDisableNewAppListMixer)}, |
1573 #endif | 1573 #endif |
1574 {"disable-threaded-scrolling", | 1574 {"disable-threaded-scrolling", |
1575 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, | 1575 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, |
1576 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, | 1576 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, |
1577 kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac, | 1577 kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac, |
1578 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling)}, | 1578 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling)}, |
1579 {"inert-visual-viewport", | |
1580 IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME, | |
1581 IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION, | |
1582 kOsAll, | |
1583 SINGLE_VALUE_TYPE(switches::kInertVisualViewport)}, | |
1584 {"enable-settings-window", | 1579 {"enable-settings-window", |
1585 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, | 1580 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, |
1586 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, | 1581 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, |
1587 kOsDesktop, | 1582 kOsDesktop, |
1588 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, | 1583 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, |
1589 switches::kDisableSettingsWindow)}, | 1584 switches::kDisableSettingsWindow)}, |
1590 #if defined(OS_MACOSX) | 1585 #if defined(OS_MACOSX) |
1591 {"enable-save-password-bubble", | 1586 {"enable-save-password-bubble", |
1592 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, | 1587 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, |
1593 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, | 1588 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2792 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2787 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2793 } | 2788 } |
2794 | 2789 |
2795 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2790 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2796 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2791 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2797 } | 2792 } |
2798 | 2793 |
2799 } // namespace testing | 2794 } // namespace testing |
2800 | 2795 |
2801 } // namespace about_flags | 2796 } // namespace about_flags |
OLD | NEW |