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

Unified Diff: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Issue 1922873005: ppapi: PPB_VpnProvider: Bind VpnService to the PPAPI Resource Host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@vpn-api-resource-host
Patch Set: Remove redundant code. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | extensions/browser/api/vpn_provider/vpn_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index e90264544d0decdcae2fa8db3a5ceee16e9aca8a..8adeb96f87829a4b0395e697e12325fb4b7ac245 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -52,6 +52,11 @@
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/switches.h"
+#if defined(OS_CHROMEOS)
+#include "extensions/browser/api/vpn_provider/vpn_service.h"
+#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
+#endif // defined(OS_CHROMEOS)
+
using content::BrowserContext;
using content::BrowserThread;
using content::BrowserURLHandler;
@@ -502,7 +507,15 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
std::unique_ptr<content::VpnServiceProxy>
ChromeContentBrowserClientExtensionsPart::GetVpnServiceProxy(
content::BrowserContext* browser_context) {
+#if defined(OS_CHROMEOS)
+ chromeos::VpnService* vpn_service =
+ chromeos::VpnServiceFactory::GetForBrowserContext(browser_context);
+ if (!vpn_service)
+ return nullptr;
+ return vpn_service->GetVpnServiceProxy();
+#else
return nullptr;
+#endif
}
void ChromeContentBrowserClientExtensionsPart::RenderProcessWillLaunch(
« no previous file with comments | « no previous file | extensions/browser/api/vpn_provider/vpn_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698