API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier.

content/browser/ppapi_plugin_process_host.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/ppapi_plugin_process_host.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "ipc/ipc_switches.h"
 #include "net/base/network_change_notifier.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "webkit/plugins/plugin_switches.h"
 
 using content::ChildProcessHost;
 using content::ChildProcessHostImpl;
 
 class PpapiPluginProcessHost::PluginNetworkObserver
     : public net::NetworkChangeNotifier::IPAddressObserver,
-      public net::NetworkChangeNotifier::OnlineStateObserver {
+      public net::NetworkChangeNotifier::ConnectionTypeObserver {
  public:
   explicit PluginNetworkObserver(PpapiPluginProcessHost* process_host)
       : process_host_(process_host) {
     net::NetworkChangeNotifier::AddIPAddressObserver(this);
-    net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+    net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   }
 
   ~PluginNetworkObserver() {
-    net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
     net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
   }
 
   // IPAddressObserver implementation.
   virtual void OnIPAddressChanged() OVERRIDE {
     // TODO(brettw) bug 90246: This doesn't seem correct. The online/offline
     // notification seems like it should be sufficient, but I don't see that
     // when I unplug and replug my network cable. Sending this notification when
     // "something" changes seems to make Flash reasonably happy, but seems
     // wrong. We should really be able to provide the real online state in
-    // OnOnlineStateChanged().
+    // OnConnectionTypeChanged().
     process_host_->Send(new PpapiMsg_SetNetworkState(true));
   }
 
-  // OnlineStateObserver implementation.
-  virtual void OnOnlineStateChanged(bool online) OVERRIDE {
-    process_host_->Send(new PpapiMsg_SetNetworkState(online));
+  // ConnectionTypeObserver implementation.
+  virtual void OnConnectionTypeChanged(
+      net::NetworkChangeNotifier::ConnectionType type) {
+    process_host_->Send(new PpapiMsg_SetNetworkState(
+        type != net::NetworkChangeNotifier::CONNECTION_NONE));
   }
 
  private:
   PpapiPluginProcessHost* const process_host_;
 };
 
 PpapiPluginProcessHost::~PpapiPluginProcessHost() {
   DVLOG(1) << "PpapiPluginProcessHost" << (is_broker_ ? "[broker]" : "")
            << "~PpapiPluginProcessHost()";
   CancelRequests();
@@ skipping 206 matching lines @@
   if (sent_requests_.empty())
     return;
 
   // All requests should be processed FIFO, so the next item in the
   // sent_requests_ queue should be the one that the plugin just created.
   Client* client = sent_requests_.front();
   sent_requests_.pop();
 
   client->OnPpapiChannelOpened(channel_handle, process_->GetData().id);
 }