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

Unified Diff: extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc

Issue 932063003: Add split tunnel interface to vpnProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits from Benjamin and a build failure Created 5 years, 10 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
Index: extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc
diff --git a/extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc b/extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc
index 0a6a15010f76427218c1eb166caca16fd36e53cf..62145473b98456a3392783fec4e6e6f06dada7aa 100644
--- a/extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc
+++ b/extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc
@@ -5,8 +5,12 @@
#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
#include "base/memory/singleton.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_handler.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "extensions/browser/api/vpn_provider/vpn_service.h"
+#include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_registry.h"
namespace chromeos {
@@ -43,7 +47,13 @@ bool VpnServiceFactory::ServiceIsNULLWhileTesting() const {
KeyedService* VpnServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
- return nullptr;
+ return new VpnService(
+ context, "testuser", extensions::ExtensionRegistry::Get(context),
+ extensions::EventRouter::Get(context),
+ DBusThreadManager::Get()->GetShillThirdPartyVpnDriverClient(),
+ NetworkHandler::Get()->network_configuration_handler(),
+ NetworkHandler::Get()->network_profile_handler(),
+ NetworkHandler::Get()->network_state_handler());
}
} // namespace chromeos
« extensions/browser/api/vpn_provider/vpn_provider_api.cc ('K') | « extensions/extensions_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698