OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 // Disable client-side phishing detection in the renderer if it is disabled | 615 // Disable client-side phishing detection in the renderer if it is disabled |
616 // in the Profile preferences or the browser process. | 616 // in the Profile preferences or the browser process. |
617 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || | 617 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || |
618 !g_browser_process->safe_browsing_detection_service()) { | 618 !g_browser_process->safe_browsing_detection_service()) { |
619 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection); | 619 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection); |
620 } | 620 } |
621 | 621 |
622 static const char* const kSwitchNames[] = { | 622 static const char* const kSwitchNames[] = { |
623 switches::kAllowHTTPBackgroundPage, | 623 switches::kAllowHTTPBackgroundPage, |
624 switches::kAllowLegacyExtensionManifests, | 624 switches::kAllowLegacyExtensionManifests, |
| 625 switches::kAllowNaClSocketAPI, |
625 switches::kAllowScriptingGallery, | 626 switches::kAllowScriptingGallery, |
626 switches::kAppsCheckoutURL, | 627 switches::kAppsCheckoutURL, |
627 switches::kAppsGalleryURL, | 628 switches::kAppsGalleryURL, |
628 switches::kCloudPrintServiceURL, | 629 switches::kCloudPrintServiceURL, |
629 switches::kDebugPrint, | 630 switches::kDebugPrint, |
630 switches::kDisablePrintPreview, | 631 switches::kDisablePrintPreview, |
631 switches::kDomAutomationController, | 632 switches::kDomAutomationController, |
632 switches::kDumpHistogramsOnExit, | 633 switches::kDumpHistogramsOnExit, |
633 switches::kEnableClickToPlay, | 634 switches::kEnableClickToPlay, |
634 switches::kEnableCrxlessWebApps, | 635 switches::kEnableCrxlessWebApps, |
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1211 #if defined(USE_NSS) | 1212 #if defined(USE_NSS) |
1212 crypto::CryptoModuleBlockingPasswordDelegate* | 1213 crypto::CryptoModuleBlockingPasswordDelegate* |
1213 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1214 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1214 const GURL& url) { | 1215 const GURL& url) { |
1215 return browser::NewCryptoModuleBlockingDialogDelegate( | 1216 return browser::NewCryptoModuleBlockingDialogDelegate( |
1216 browser::kCryptoModulePasswordKeygen, url.host()); | 1217 browser::kCryptoModulePasswordKeygen, url.host()); |
1217 } | 1218 } |
1218 #endif | 1219 #endif |
1219 | 1220 |
1220 } // namespace chrome | 1221 } // namespace chrome |
OLD | NEW |