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

Side by Side Diff: extensions/shell/browser/api/vpn_provider/vpn_service_factory.cc

Issue 974443002: Make vpn destroyConfig generate disconnect message for connected configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/api/vpn_provider/vpn_service_factory.h" 5 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "chromeos/dbus/dbus_thread_manager.h" 8 #include "chromeos/dbus/dbus_thread_manager.h"
9 #include "chromeos/network/network_handler.h" 9 #include "chromeos/network/network_handler.h"
10 #include "components/keyed_service/content/browser_context_dependency_manager.h" 10 #include "components/keyed_service/content/browser_context_dependency_manager.h"
(...skipping 30 matching lines...) Expand all
41 return true; 41 return true;
42 } 42 }
43 43
44 bool VpnServiceFactory::ServiceIsNULLWhileTesting() const { 44 bool VpnServiceFactory::ServiceIsNULLWhileTesting() const {
45 return true; 45 return true;
46 } 46 }
47 47
48 KeyedService* VpnServiceFactory::BuildServiceInstanceFor( 48 KeyedService* VpnServiceFactory::BuildServiceInstanceFor(
49 content::BrowserContext* context) const { 49 content::BrowserContext* context) const {
50 return new VpnService( 50 return new VpnService(
51 context, "testuser", extensions::ExtensionRegistry::Get(context), 51 context, "testuser",
52 extensions::AppWindowRegistry::Get(context),
bartfab (slow) 2015/03/10 13:28:41 Nit: No longer needed.
53 extensions::ExtensionRegistry::Get(context),
52 extensions::EventRouter::Get(context), 54 extensions::EventRouter::Get(context),
53 DBusThreadManager::Get()->GetShillThirdPartyVpnDriverClient(), 55 DBusThreadManager::Get()->GetShillThirdPartyVpnDriverClient(),
54 NetworkHandler::Get()->network_configuration_handler(), 56 NetworkHandler::Get()->network_configuration_handler(),
55 NetworkHandler::Get()->network_profile_handler(), 57 NetworkHandler::Get()->network_profile_handler(),
56 NetworkHandler::Get()->network_state_handler()); 58 NetworkHandler::Get()->network_state_handler());
57 } 59 }
58 60
59 } // namespace chromeos 61 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698