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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2533 bool private_api, | 2533 bool private_api, |
2534 const content::SocketPermissionRequest* params) { | 2534 const content::SocketPermissionRequest* params) { |
2535 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) | 2535 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) |
2536 return ChromeContentBrowserClientPluginsPart::AllowPepperSocketAPI( | 2536 return ChromeContentBrowserClientPluginsPart::AllowPepperSocketAPI( |
2537 browser_context, url, private_api, params, allowed_socket_origins_); | 2537 browser_context, url, private_api, params, allowed_socket_origins_); |
2538 #else | 2538 #else |
2539 return false; | 2539 return false; |
2540 #endif | 2540 #endif |
2541 } | 2541 } |
2542 | 2542 |
| 2543 bool ChromeContentBrowserClient::IsPepperVpnProviderAPIAllowed( |
| 2544 content::BrowserContext* browser_context, |
| 2545 const GURL& url) { |
| 2546 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) |
| 2547 return ChromeContentBrowserClientPluginsPart::IsPepperVpnProviderAPIAllowed( |
| 2548 browser_context, url); |
| 2549 #else |
| 2550 return false; |
| 2551 #endif |
| 2552 } |
| 2553 |
2543 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy( | 2554 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy( |
2544 WebContents* web_contents) { | 2555 WebContents* web_contents) { |
2545 return new ChromeSelectFilePolicy(web_contents); | 2556 return new ChromeSelectFilePolicy(web_contents); |
2546 } | 2557 } |
2547 | 2558 |
2548 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( | 2559 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
2549 std::vector<std::string>* additional_allowed_schemes) { | 2560 std::vector<std::string>* additional_allowed_schemes) { |
2550 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( | 2561 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
2551 additional_allowed_schemes); | 2562 additional_allowed_schemes); |
2552 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); | 2563 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2976 if (channel <= kMaxDisableEncryptionChannel) { | 2987 if (channel <= kMaxDisableEncryptionChannel) { |
2977 static const char* const kWebRtcDevSwitchNames[] = { | 2988 static const char* const kWebRtcDevSwitchNames[] = { |
2978 switches::kDisableWebRtcEncryption, | 2989 switches::kDisableWebRtcEncryption, |
2979 }; | 2990 }; |
2980 to_command_line->CopySwitchesFrom(from_command_line, | 2991 to_command_line->CopySwitchesFrom(from_command_line, |
2981 kWebRtcDevSwitchNames, | 2992 kWebRtcDevSwitchNames, |
2982 arraysize(kWebRtcDevSwitchNames)); | 2993 arraysize(kWebRtcDevSwitchNames)); |
2983 } | 2994 } |
2984 } | 2995 } |
2985 #endif // defined(ENABLE_WEBRTC) | 2996 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |