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

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

Issue 9147026: API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Review comments Created 8 years, 7 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 ac107dae4c27a6ec7e01f0d4a1f9b11686fb7ad6..772110019de3a72d99b826293b07ea528766b580 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -60,13 +60,13 @@ OfflineLoadPage::OfflineLoadPage(WebContents* web_contents,
proceeded_(false),
web_contents_(web_contents),
url_(url) {
- net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+ net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
interstitial_page_ = InterstitialPage::Create(web_contents, true, url, this);
}
OfflineLoadPage::~OfflineLoadPage() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+ net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
}
void OfflineLoadPage::Show() {
@@ -202,12 +202,14 @@ void OfflineLoadPage::NotifyBlockingPageComplete(bool proceed) {
BrowserThread::IO, FROM_HERE, base::Bind(callback_, proceed));
}
-void OfflineLoadPage::OnOnlineStateChanged(bool online) {
+void OfflineLoadPage::OnConnectionTypeChanged(
+ net::NetworkChangeNotifier::ConnectionType type) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DVLOG(1) << "OnlineStateObserver notification received: state="
+ const bool online = type != net::NetworkChangeNotifier::CONNECTION_NONE;
+ DVLOG(1) << "ConnectionTypeObserver notification received: state="
<< (online ? "online" : "offline");
if (online) {
- net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+ net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
interstitial_page_->Proceed();
}
}

Powered by Google App Engine
This is Rietveld 408576698