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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1184 command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 1184 command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
1185 | 1185 |
1186 #if defined(ENABLE_MESSAGE_CENTER) | 1186 #if defined(ENABLE_MESSAGE_CENTER) |
1187 if (message_center::IsRichNotificationEnabled()) | 1187 if (message_center::IsRichNotificationEnabled()) |
1188 command_line->AppendSwitch(switches::kDisableHTMLNotifications); | 1188 command_line->AppendSwitch(switches::kDisableHTMLNotifications); |
1189 #endif | 1189 #endif |
1190 | 1190 |
1191 // Please keep this in alphabetical order. | 1191 // Please keep this in alphabetical order. |
1192 static const char* const kSwitchNames[] = { | 1192 static const char* const kSwitchNames[] = { |
1193 autofill::switches::kEnableExperimentalFormFilling, | 1193 autofill::switches::kEnableExperimentalFormFilling, |
1194 switches::kAllowRequestOSFileHandleAPI, | |
1195 switches::kAllowHTTPBackgroundPage, | 1194 switches::kAllowHTTPBackgroundPage, |
1196 switches::kAllowLegacyExtensionManifests, | 1195 switches::kAllowLegacyExtensionManifests, |
1197 switches::kAllowScriptingGallery, | 1196 switches::kAllowScriptingGallery, |
1198 switches::kAppsCheckoutURL, | 1197 switches::kAppsCheckoutURL, |
1199 switches::kAppsGalleryURL, | 1198 switches::kAppsGalleryURL, |
1200 switches::kCloudPrintServiceURL, | 1199 switches::kCloudPrintServiceURL, |
1201 switches::kDebugPrint, | 1200 switches::kDebugPrint, |
1202 switches::kDisableBundledPpapiFlash, | 1201 switches::kDisableBundledPpapiFlash, |
1203 switches::kDisableExtensionsResourceWhitelist, | 1202 switches::kDisableExtensionsResourceWhitelist, |
1204 switches::kDisableScriptedPrintThrottling, | 1203 switches::kDisableScriptedPrintThrottling, |
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2194 #if defined(USE_NSS) | 2193 #if defined(USE_NSS) |
2195 crypto::CryptoModuleBlockingPasswordDelegate* | 2194 crypto::CryptoModuleBlockingPasswordDelegate* |
2196 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2195 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2197 const GURL& url) { | 2196 const GURL& url) { |
2198 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2197 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2199 chrome::kCryptoModulePasswordKeygen, url.host()); | 2198 chrome::kCryptoModulePasswordKeygen, url.host()); |
2200 } | 2199 } |
2201 #endif | 2200 #endif |
2202 | 2201 |
2203 } // namespace chrome | 2202 } // namespace chrome |
OLD | NEW |