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

Unified Diff: chrome/browser/chromeos/offline/offline_load_page.cc

Issue 11620007: Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/offline/offline_load_page.cc
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index 1e71dcafdce33d735c5e3efe26cca04c032103a0..87efb3c0ef4bd4b920a5ba61b9982f5abb61a8cd 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -61,13 +61,13 @@ OfflineLoadPage::OfflineLoadPage(WebContents* web_contents,
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() {
@@ -200,14 +200,14 @@ void OfflineLoadPage::NotifyBlockingPageComplete(bool proceed) {
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();
}
}

Powered by Google App Engine
This is Rietveld 408576698