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

Unified Diff: chrome/browser/sync/engine/syncapi.cc

Issue 6526059: Plumb through NetworkChangeNotifier::IsOffline() to WebKit, enabling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Appease the C++ type system Created 9 years, 10 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
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/common/render_messages_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncapi.cc
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index 3c31f7703591371156ab00378812a3d02703bfcd..07f66035ab17263a53b760c5903d10e16de782e4 100644
--- a/chrome/browser/sync/engine/syncapi.cc
+++ b/chrome/browser/sync/engine/syncapi.cc
@@ -1107,7 +1107,7 @@ const sync_pb::PasswordSpecificsData&
//////////////////////////////////////////////////////////////////////////
// SyncManager's implementation: SyncManager::SyncInternal
class SyncManager::SyncInternal
- : public net::NetworkChangeNotifier::Observer,
+ : public net::NetworkChangeNotifier::IPAddressObserver,
public TalkMediator::Delegate,
public sync_notifier::StateWriter,
public browser_sync::ChannelEventHandler<syncable::DirectoryChangeEvent>,
@@ -1667,7 +1667,7 @@ bool SyncManager::SyncInternal::Init(
NewEventListenerHookup(connection_manager()->channel(), this,
&SyncManager::SyncInternal::HandleServerConnectionEvent));
- net::NetworkChangeNotifier::AddObserver(this);
+ net::NetworkChangeNotifier::AddIPAddressObserver(this);
// TODO(akalin): CheckServerReachable() can block, which may cause jank if we
// try to shut down sync. Fix this.
core_message_loop_->PostTask(FROM_HERE,
@@ -2159,7 +2159,7 @@ void SyncManager::SyncInternal::Shutdown() {
core_message_loop_->SetNestableTasksAllowed(old_state);
}
- net::NetworkChangeNotifier::RemoveObserver(this);
+ net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
connection_manager_hookup_.reset();
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/common/render_messages_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698