Make vpn destroyConfig generate disconnect message for connected configuration

extensions/browser/api/vpn_provider/vpn_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
 #define EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/network/network_configuration_observer.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "extensions/browser/app_window/app_window_registry.h"

[bartfab (slow), 2015/03/10 13:28:41]

Nit: No longer needed.

 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/api/vpn_provider.h"
 
 namespace base {
 
 class DictionaryValue;
 class ListValue;
 
 }  // namespace base
 
 namespace content {
 
 class BrowserContext;
 
 }  // namespace content
 
 namespace extensions {
 
+class AppWindow;

[bartfab (slow), 2015/03/10 13:28:41]

Nit: No longer needed.

 class EventRouter;
 class ExtensionRegistry;
 
 }  // namespace extensions
 
 namespace chromeos {
 
 class NetworkConfigurationHandler;
 class NetworkProfileHandler;
 class NetworkStateHandler;
 class ShillThirdPartyVpnDriverClient;
 
 // The class manages the VPN configurations.
 class VpnService : public KeyedService,
+                   public extensions::AppWindowRegistry::Observer,

[bartfab (slow), 2015/03/10 13:28:41]

Nit: No longer needed.

                    public NetworkConfigurationObserver,
                    public NetworkStateHandlerObserver,
                    public extensions::ExtensionRegistryObserver {
  public:
   using SuccessCallback = base::Closure;
   using FailureCallback =
       base::Callback<void(const std::string& error_name,
                           const std::string& error_message)>;
 
   VpnService(content::BrowserContext* browser_context,
              const std::string& userid_hash,
+             extensions::AppWindowRegistry* app_window_registry,

[bartfab (slow), 2015/03/10 13:28:40]

Nit: No longer needed.

              extensions::ExtensionRegistry* extension_registry,
              extensions::EventRouter* event_router,
              ShillThirdPartyVpnDriverClient* shill_client,
              NetworkConfigurationHandler* network_configuration_handler,
              NetworkProfileHandler* network_profile_handler,
              NetworkStateHandler* network_state_handler);
   ~VpnService() override;
 
   // NetworkConfigurationObserver:
   void OnConfigurationCreated(const std::string& service_path,
@@ skipping 11 matching lines @@
                                      const std::string& profile_path,
                                      Source source) override;
 
   // NetworkStateHandlerObserver:
   void NetworkListChanged() override;
 
   // ExtensionRegistryObserver:
   void OnExtensionUninstalled(content::BrowserContext* browser_context,
                               const extensions::Extension* extension,
                               extensions::UninstallReason reason) override;
 

[bartfab (slow), 2015/03/10 13:28:41]

Nit: Remove blank linke to make it clear that this is also an
|ExtensionRegistryObserver| method.

+  void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      extensions::UnloadedExtensionInfo::Reason reason) override;
+
+  // AppWindowRegistry::Observer:
+  void OnAppWindowRemoved(extensions::AppWindow* app_window) override;

[bartfab (slow), 2015/03/10 13:28:40]

Nit: As discussed offline, we do not need this.

+
   // Creates a new VPN configuration with |configuration_name| as the name and
   // attaches it to the extension with id |extension_id|.
   // Calls |success| or |failure| based on the outcome.
   void CreateConfiguration(const std::string& extension_id,
                            const std::string& extension_name,
                            const std::string& configuration_name,
                            const SuccessCallback& success,
                            const FailureCallback& failure);
 
   // Destroys the VPN configuration with the name |configuration_name| after
@@ skipping 82 matching lines @@
   void SendSignalToExtension(const std::string& extension_id,
                              const std::string& event_name,
                              scoped_ptr<base::ListValue> event_args);
 
   // Set the active configuration.
   void SetActiveConfiguration(VpnConfiguration* configuration);
 
   content::BrowserContext* browser_context_;
   std::string userid_hash_;
 
+  extensions::AppWindowRegistry* app_window_registry_;

[bartfab (slow), 2015/03/10 13:28:40]

Nit: No longer needed.

   extensions::ExtensionRegistry* extension_registry_;
   extensions::EventRouter* event_router_;
   ShillThirdPartyVpnDriverClient* shill_client_;
   NetworkConfigurationHandler* network_configuration_handler_;
   NetworkProfileHandler* network_profile_handler_;
   NetworkStateHandler* network_state_handler_;
 
   VpnConfiguration* active_configuration_;
 
   // Key map owns the VpnConfigurations.
   StringToConfigurationMap key_to_configuration_map_;
 
   // Service path does not own the VpnConfigurations.
   StringToConfigurationMap service_path_to_configuration_map_;
 
   base::WeakPtrFactory<VpnService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VpnService);
 };
 
 }  // namespace chromeos
 
 #endif  // EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_