Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/chromeos/offline/offline_load_page.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 "chrome/browser/chromeos/offline/offline_load_page.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/i18n/rtl.h"
@@ skipping 43 matching lines @@
 
 namespace chromeos {
 
 OfflineLoadPage::OfflineLoadPage(WebContents* web_contents,
                                  const GURL& url,
                                  const CompletionCallback& callback)
     : callback_(callback),
       proceeded_(false),
       web_contents_(web_contents),
       url_(url) {
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   interstitial_page_ = InterstitialPage::Create(web_contents, true, url, this);
 }
 
 OfflineLoadPage::~OfflineLoadPage() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void OfflineLoadPage::Show() {
   interstitial_page_->Show();
 }
 
 std::string OfflineLoadPage::GetHTMLContents() {
   DictionaryValue strings;
   int64 time_to_wait = kMaxBlankPeriod;
   // Set the timeout to show the page.
@@ skipping 112 matching lines @@
   } else {
     LOG(WARNING) << "Unknown command:" << cmd;
   }
 }
 
 void OfflineLoadPage::NotifyBlockingPageComplete(bool proceed) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(callback_, proceed));
 }
 
-void OfflineLoadPage::OnConnectionTypeChanged(
+void OfflineLoadPage::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const bool online = type != net::NetworkChangeNotifier::CONNECTION_NONE;
   DVLOG(1) << "ConnectionTypeObserver notification received: state="
            << (online ? "online" : "offline");
   if (online) {
-    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+    net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
     interstitial_page_->Proceed();
   }
 }
 
 bool OfflineLoadPage::ShowActivationMessage() {
   CrosLibrary* cros = CrosLibrary::Get();
   if (!cros || !cros->GetNetworkLibrary()->cellular_available())
     return false;
 
   const CellularNetworkVector& cell_networks =
       cros->GetNetworkLibrary()->cellular_networks();
   for (size_t i = 0; i < cell_networks.size(); ++i) {
     chromeos::ActivationState activation_state =
         cell_networks[i]->activation_state();
     if (activation_state == ACTIVATION_STATE_ACTIVATED)
       return false;
   }
   return true;
 }
 
 }  // namespace chromeos