Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1988613005: ppapi: PPB_VpnProvider: Implement Service Helper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@vpn-permission
Patch Set: Refactor patch. Communication now handled using ContentBrowserClient. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2497 matching lines...) Expand 10 before | Expand all | Expand 10 after
2508 content::BrowserContext* browser_context, 2508 content::BrowserContext* browser_context,
2509 const GURL& url) { 2509 const GURL& url) {
2510 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 2510 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
2511 return ChromeContentBrowserClientPluginsPart::IsPepperVpnProviderAPIAllowed( 2511 return ChromeContentBrowserClientPluginsPart::IsPepperVpnProviderAPIAllowed(
2512 browser_context, url); 2512 browser_context, url);
2513 #else 2513 #else
2514 return false; 2514 return false;
2515 #endif 2515 #endif
2516 } 2516 }
2517 2517
2518 content::VpnServiceProxy* ChromeContentBrowserClient::GetVpnServiceProxy(
2519 content::BrowserContext* browser_context) {
2520 #if defined(ENABLE_EXTENSIONS)
2521 return ChromeContentBrowserClientExtensionsPart::GetVpnServiceProxy(
2522 browser_context);
2523 #else
2524 return nullptr;
2525 #endif
2526 }
2527
2518 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy( 2528 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
2519 WebContents* web_contents) { 2529 WebContents* web_contents) {
2520 return new ChromeSelectFilePolicy(web_contents); 2530 return new ChromeSelectFilePolicy(web_contents);
2521 } 2531 }
2522 2532
2523 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2533 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2524 std::vector<std::string>* additional_allowed_schemes) { 2534 std::vector<std::string>* additional_allowed_schemes) {
2525 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2535 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2526 additional_allowed_schemes); 2536 additional_allowed_schemes);
2527 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2537 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
2972 if (channel <= kMaxDisableEncryptionChannel) { 2982 if (channel <= kMaxDisableEncryptionChannel) {
2973 static const char* const kWebRtcDevSwitchNames[] = { 2983 static const char* const kWebRtcDevSwitchNames[] = {
2974 switches::kDisableWebRtcEncryption, 2984 switches::kDisableWebRtcEncryption,
2975 }; 2985 };
2976 to_command_line->CopySwitchesFrom(from_command_line, 2986 to_command_line->CopySwitchesFrom(from_command_line,
2977 kWebRtcDevSwitchNames, 2987 kWebRtcDevSwitchNames,
2978 arraysize(kWebRtcDevSwitchNames)); 2988 arraysize(kWebRtcDevSwitchNames));
2979 } 2989 }
2980 } 2990 }
2981 #endif // defined(ENABLE_WEBRTC) 2991 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698