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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
581 // Disable client-side phishing detection in the renderer if it is disabled | 581 // Disable client-side phishing detection in the renderer if it is disabled |
582 // in the Profile preferences or the browser process. | 582 // in the Profile preferences or the browser process. |
583 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || | 583 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || |
584 !g_browser_process->safe_browsing_detection_service()) { | 584 !g_browser_process->safe_browsing_detection_service()) { |
585 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection); | 585 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection); |
586 } | 586 } |
587 | 587 |
588 static const char* const kSwitchNames[] = { | 588 static const char* const kSwitchNames[] = { |
589 switches::kAllowHTTPBackgroundPage, | 589 switches::kAllowHTTPBackgroundPage, |
590 switches::kAllowLegacyExtensionManifests, | 590 switches::kAllowLegacyExtensionManifests, |
| 591 switches::kAllowNaClSocketAPI, |
591 switches::kAllowScriptingGallery, | 592 switches::kAllowScriptingGallery, |
592 switches::kAppsCheckoutURL, | 593 switches::kAppsCheckoutURL, |
593 switches::kAppsGalleryURL, | 594 switches::kAppsGalleryURL, |
594 switches::kCloudPrintServiceURL, | 595 switches::kCloudPrintServiceURL, |
595 switches::kDebugPrint, | 596 switches::kDebugPrint, |
596 switches::kDisablePrintPreview, | 597 switches::kDisablePrintPreview, |
597 switches::kDomAutomationController, | 598 switches::kDomAutomationController, |
598 switches::kDumpHistogramsOnExit, | 599 switches::kDumpHistogramsOnExit, |
599 switches::kEnableClickToPlay, | 600 switches::kEnableClickToPlay, |
600 switches::kEnableCrxlessWebApps, | 601 switches::kEnableCrxlessWebApps, |
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1177 #if defined(USE_NSS) | 1178 #if defined(USE_NSS) |
1178 crypto::CryptoModuleBlockingPasswordDelegate* | 1179 crypto::CryptoModuleBlockingPasswordDelegate* |
1179 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1180 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1180 const GURL& url) { | 1181 const GURL& url) { |
1181 return browser::NewCryptoModuleBlockingDialogDelegate( | 1182 return browser::NewCryptoModuleBlockingDialogDelegate( |
1182 browser::kCryptoModulePasswordKeygen, url.host()); | 1183 browser::kCryptoModulePasswordKeygen, url.host()); |
1183 } | 1184 } |
1184 #endif | 1185 #endif |
1185 | 1186 |
1186 } // namespace chrome | 1187 } // namespace chrome |
OLD | NEW |