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 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1571 IDS_FLAGS_BLEEDING_RENDERER_NAME, | 1571 IDS_FLAGS_BLEEDING_RENDERER_NAME, |
1572 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, | 1572 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, |
1573 kOsAndroid, | 1573 kOsAndroid, |
1574 SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths)}, | 1574 SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths)}, |
1575 {"enable-settings-window", | 1575 {"enable-settings-window", |
1576 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, | 1576 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, |
1577 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, | 1577 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, |
1578 kOsDesktop, | 1578 kOsDesktop, |
1579 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, | 1579 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, |
1580 switches::kDisableSettingsWindow)}, | 1580 switches::kDisableSettingsWindow)}, |
1581 #if !defined(USE_AURA) | |
vabr (Chromium)
2015/09/10 07:21:47
Note that Win, Linux and CrOS always have Aura def
ki.stfu
2015/09/10 18:21:00
Done.
| |
1581 {"enable-save-password-bubble", | 1582 {"enable-save-password-bubble", |
1582 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, | 1583 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, |
1583 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, | 1584 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
1584 kOsWin | kOsLinux | kOsCrOS | kOsMac, | 1585 kOsWin | kOsLinux | kOsCrOS, |
1585 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, | 1586 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, |
1586 switches::kDisableSavePasswordBubble)}, | 1587 switches::kDisableSavePasswordBubble)}, |
1588 #endif | |
1587 {"enable-apps-file-associations", | 1589 {"enable-apps-file-associations", |
1588 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, | 1590 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, |
1589 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, | 1591 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
1590 kOsMac, | 1592 kOsMac, |
1591 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)}, | 1593 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)}, |
1592 #if defined(OS_ANDROID) | 1594 #if defined(OS_ANDROID) |
1593 {"enable-embeddedsearch-api", | 1595 {"enable-embeddedsearch-api", |
1594 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, | 1596 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, |
1595 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, | 1597 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, |
1596 kOsAndroid, | 1598 kOsAndroid, |
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2716 } | 2718 } |
2717 | 2719 |
2718 const Experiment* GetExperiments(size_t* count) { | 2720 const Experiment* GetExperiments(size_t* count) { |
2719 *count = num_experiments; | 2721 *count = num_experiments; |
2720 return experiments; | 2722 return experiments; |
2721 } | 2723 } |
2722 | 2724 |
2723 } // namespace testing | 2725 } // namespace testing |
2724 | 2726 |
2725 } // namespace about_flags | 2727 } // namespace about_flags |
OLD | NEW |