Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / networking_private / networking_private_event_router_chromeos.cc

diff --git a/src/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/src/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
index bdd86d3..f2f5045 100644 (file)
--- a/src/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
+++ b/src/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
@@ -6,7 +6,6 @@
 
 #include "base/json/json_writer.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/extensions/api/networking_private/networking_private_api.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/browser/profiles/profile.h"
@@ -17,6 +16,7 @@
 #include "chromeos/network/network_state_handler_observer.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translator.h"
+#include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/onc/onc_constants.h"
 #include "extensions/browser/extension_system.h"
@@ -39,20 +39,20 @@ class NetworkingPrivateEventRouterImpl
 
  protected:
   // KeyedService overrides:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // EventRouter::Observer overrides:
-  virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE;
-  virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE;
+  virtual void OnListenerAdded(const EventListenerInfo& details) override;
+  virtual void OnListenerRemoved(const EventListenerInfo& details) override;
 
   // NetworkStateHandlerObserver overrides:
-  virtual void NetworkListChanged() OVERRIDE;
-  virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE;
+  virtual void NetworkListChanged() override;
+  virtual void NetworkPropertiesUpdated(const NetworkState* network) override;
 
   // NetworkPortalDetector::Observer overrides:
   virtual void OnPortalDetectionCompleted(
       const NetworkState* network,
-      const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE;
+      const NetworkPortalDetector::CaptivePortalState& state) override;
 
  private:
   // Decide if we should listen for network changes or not. If there are any