| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1508 }, | 1508 }, |
| 1509 { | 1509 { |
| 1510 "enable-reset-profile-settings", | 1510 "enable-reset-profile-settings", |
| 1511 IDS_FLAGS_ENABLE_RESET_PROFILE_SETTINGS_NAME, | 1511 IDS_FLAGS_ENABLE_RESET_PROFILE_SETTINGS_NAME, |
| 1512 IDS_FLAGS_ENABLE_RESET_PROFILE_SETTINGS_DESCRIPTION, | 1512 IDS_FLAGS_ENABLE_RESET_PROFILE_SETTINGS_DESCRIPTION, |
| 1513 kOsAll, | 1513 kOsAll, |
| 1514 SINGLE_VALUE_TYPE(switches::kEnableResetProfileSettings) | 1514 SINGLE_VALUE_TYPE(switches::kEnableResetProfileSettings) |
| 1515 }, | 1515 }, |
| 1516 #if defined(OS_MACOSX) | 1516 #if defined(OS_MACOSX) |
| 1517 { | 1517 { |
| 1518 "enable-app-list-shim", | |
| 1519 IDS_FLAGS_ENABLE_APP_LIST_SHIM_NAME, | |
| 1520 IDS_FLAGS_ENABLE_APP_LIST_SHIM_DESCRIPTION, | |
| 1521 kOsMac, | |
| 1522 SINGLE_VALUE_TYPE(switches::kEnableAppListShim) | |
| 1523 }, | |
| 1524 { | |
| 1525 "enable-app-shims", | 1518 "enable-app-shims", |
| 1526 IDS_FLAGS_ENABLE_APP_SHIMS_NAME, | 1519 IDS_FLAGS_ENABLE_APP_SHIMS_NAME, |
| 1527 IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION, | 1520 IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION, |
| 1528 kOsMac, | 1521 kOsMac, |
| 1529 SINGLE_VALUE_TYPE(switches::kEnableAppShims) | 1522 SINGLE_VALUE_TYPE(switches::kEnableAppShims) |
| 1530 }, | 1523 }, |
| 1531 { | 1524 { |
| 1532 "enable-simplified-fullscreen", | 1525 "enable-simplified-fullscreen", |
| 1533 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME, | 1526 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME, |
| 1534 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION, | 1527 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION, |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2113 } | 2106 } |
| 2114 | 2107 |
| 2115 const Experiment* GetExperiments(size_t* count) { | 2108 const Experiment* GetExperiments(size_t* count) { |
| 2116 *count = num_experiments; | 2109 *count = num_experiments; |
| 2117 return experiments; | 2110 return experiments; |
| 2118 } | 2111 } |
| 2119 | 2112 |
| 2120 } // namespace testing | 2113 } // namespace testing |
| 2121 | 2114 |
| 2122 } // namespace about_flags | 2115 } // namespace about_flags |
| OLD | NEW |