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 1640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1651 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, | 1651 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, |
1652 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, | 1652 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, |
1653 kOsCrOS | kOsMac | kOsWin, | 1653 kOsCrOS | kOsMac | kOsWin, |
1654 SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) | 1654 SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) |
1655 }, | 1655 }, |
1656 { | 1656 { |
1657 "enable-session-crashed-bubble", | 1657 "enable-session-crashed-bubble", |
1658 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, | 1658 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, |
1659 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION, | 1659 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION, |
1660 kOsWin | kOsLinux, | 1660 kOsWin | kOsLinux, |
1661 SINGLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble) | 1661 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble, |
| 1662 switches::kDisableSessionCrashedBubble) |
1662 }, | 1663 }, |
1663 { | 1664 { |
1664 "out-of-process-pdf", | 1665 "out-of-process-pdf", |
1665 IDS_FLAGS_OUT_OF_PROCESS_PDF_NAME, | 1666 IDS_FLAGS_OUT_OF_PROCESS_PDF_NAME, |
1666 IDS_FLAGS_OUT_OF_PROCESS_PDF_DESCRIPTION, | 1667 IDS_FLAGS_OUT_OF_PROCESS_PDF_DESCRIPTION, |
1667 kOsDesktop, | 1668 kOsDesktop, |
1668 SINGLE_VALUE_TYPE(switches::kOutOfProcessPdf) | 1669 SINGLE_VALUE_TYPE(switches::kOutOfProcessPdf) |
1669 }, | 1670 }, |
1670 #if defined(OS_ANDROID) | 1671 #if defined(OS_ANDROID) |
1671 { | 1672 { |
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2362 } | 2363 } |
2363 | 2364 |
2364 const Experiment* GetExperiments(size_t* count) { | 2365 const Experiment* GetExperiments(size_t* count) { |
2365 *count = num_experiments; | 2366 *count = num_experiments; |
2366 return experiments; | 2367 return experiments; |
2367 } | 2368 } |
2368 | 2369 |
2369 } // namespace testing | 2370 } // namespace testing |
2370 | 2371 |
2371 } // namespace about_flags | 2372 } // namespace about_flags |
OLD | NEW |