| 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 2028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2039 #if defined(USE_ASH) | 2039 #if defined(USE_ASH) |
| 2040 { | 2040 { |
| 2041 "enable-web-app-frame", | 2041 "enable-web-app-frame", |
| 2042 IDS_FLAGS_ENABLE_WEB_APP_FRAME_NAME, | 2042 IDS_FLAGS_ENABLE_WEB_APP_FRAME_NAME, |
| 2043 IDS_FLAGS_ENABLE_WEB_APP_FRAME_DESCRIPTION, | 2043 IDS_FLAGS_ENABLE_WEB_APP_FRAME_DESCRIPTION, |
| 2044 kOsWin | kOsCrOS, | 2044 kOsWin | kOsCrOS, |
| 2045 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame) | 2045 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame) |
| 2046 }, | 2046 }, |
| 2047 #endif | 2047 #endif |
| 2048 { | 2048 { |
| 2049 "enable-website-settings-manager", | |
| 2050 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME, | |
| 2051 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION, | |
| 2052 kOsDesktop, | |
| 2053 SINGLE_VALUE_TYPE(switches::kEnableWebsiteSettingsManager) | |
| 2054 }, | |
| 2055 { | |
| 2056 "remember-cert-error-decisions", | 2049 "remember-cert-error-decisions", |
| 2057 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME, | 2050 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME, |
| 2058 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION, | 2051 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION, |
| 2059 kOsAll, | 2052 kOsAll, |
| 2060 MULTI_VALUE_TYPE(kRememberCertificateErrorDecisionsChoices) | 2053 MULTI_VALUE_TYPE(kRememberCertificateErrorDecisionsChoices) |
| 2061 }, | 2054 }, |
| 2062 { | 2055 { |
| 2063 "enable-drop-sync-credential", | 2056 "enable-drop-sync-credential", |
| 2064 IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_NAME, | 2057 IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_NAME, |
| 2065 IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_DESCRIPTION, | 2058 IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_DESCRIPTION, |
| (...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3033 } | 3026 } |
| 3034 | 3027 |
| 3035 const Experiment* GetExperiments(size_t* count) { | 3028 const Experiment* GetExperiments(size_t* count) { |
| 3036 *count = num_experiments; | 3029 *count = num_experiments; |
| 3037 return experiments; | 3030 return experiments; |
| 3038 } | 3031 } |
| 3039 | 3032 |
| 3040 } // namespace testing | 3033 } // namespace testing |
| 3041 | 3034 |
| 3042 } // namespace about_flags | 3035 } // namespace about_flags |
| OLD | NEW |