diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 01:25:42 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 01:25:42 +0000 |
| commit | cbd7a2e8c3aee35a3e55c88e93f25652c5709f27 (patch) | |
| tree | 74ca1d3a1b161b98b131d22a06dbaa01cafdf24a /chrome | |
| parent | a3b52885c4d2e91e05c92b29904c35279b3f3e6c (diff) | |
| download | chromium_src-cbd7a2e8c3aee35a3e55c88e93f25652c5709f27.zip chromium_src-cbd7a2e8c3aee35a3e55c88e93f25652c5709f27.tar.gz chromium_src-cbd7a2e8c3aee35a3e55c88e93f25652c5709f27.tar.bz2 | |
Revert 45263 - We check for a sync specific service URL (or an empty) one before acting on a notification from TalkMediator.
BUG=None
TEST=Test Bookmarks Sync Notifications.
Review URL: http://codereview.chromium.org/1700003
TBR=sanjeevr@google.com
Review URL: http://codereview.chromium.org/1694009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index c26be91..66c412b 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -633,15 +633,11 @@ void SyncerThread::HandleTalkMediatorEvent(const TalkMediatorEvent& event) { p2p_subscribed_ = false; break; case TalkMediatorEvent::NOTIFICATION_RECEIVED: - // Check if the service url is a sync URL. An empty service URL - // is treated as a legacy sync notification. - if (event.notification_data.service_url.empty() || - (event.notification_data.service_url == kSyncLegacyServiceUrl) || - (event.notification_data.service_url == kSyncServiceUrl)) { - LOG(INFO) << "P2P: Updates on server, pushing syncer"; - if (NULL != vault_.syncer_) { - NudgeSyncImpl(0, kNotification); - } + // TODO(sanjeevr): Check if the service url is a sync URL. + // An empty service URL is treated as a legacy sync notification. + LOG(INFO) << "P2P: Updates on server, pushing syncer"; + if (NULL != vault_.syncer_) { + NudgeSyncImpl(0, kNotification); } break; default: |