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 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1693 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, | 1693 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, |
1694 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, | 1694 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, |
1695 kOsCrOS | kOsMac | kOsWin, | 1695 kOsCrOS | kOsMac | kOsWin, |
1696 SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) | 1696 SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) |
1697 }, | 1697 }, |
1698 { | 1698 { |
1699 "enable-session-crashed-bubble", | 1699 "enable-session-crashed-bubble", |
1700 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, | 1700 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, |
1701 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION, | 1701 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION, |
1702 kOsWin | kOsLinux, | 1702 kOsWin | kOsLinux, |
1703 SINGLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble) | 1703 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble, |
| 1704 switches::kDisableSessionCrashedBubble) |
1704 }, | 1705 }, |
1705 { | 1706 { |
1706 "out-of-process-pdf", | 1707 "out-of-process-pdf", |
1707 IDS_FLAGS_OUT_OF_PROCESS_PDF_NAME, | 1708 IDS_FLAGS_OUT_OF_PROCESS_PDF_NAME, |
1708 IDS_FLAGS_OUT_OF_PROCESS_PDF_DESCRIPTION, | 1709 IDS_FLAGS_OUT_OF_PROCESS_PDF_DESCRIPTION, |
1709 kOsDesktop, | 1710 kOsDesktop, |
1710 SINGLE_VALUE_TYPE(switches::kOutOfProcessPdf) | 1711 SINGLE_VALUE_TYPE(switches::kOutOfProcessPdf) |
1711 }, | 1712 }, |
1712 #if defined(OS_ANDROID) | 1713 #if defined(OS_ANDROID) |
1713 { | 1714 { |
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2388 } | 2389 } |
2389 | 2390 |
2390 const Experiment* GetExperiments(size_t* count) { | 2391 const Experiment* GetExperiments(size_t* count) { |
2391 *count = num_experiments; | 2392 *count = num_experiments; |
2392 return experiments; | 2393 return experiments; |
2393 } | 2394 } |
2394 | 2395 |
2395 } // namespace testing | 2396 } // namespace testing |
2396 | 2397 |
2397 } // namespace about_flags | 2398 } // namespace about_flags |
OLD | NEW |