summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-07 22:42:48 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-07 22:42:48 +0000
commit22e9fcb4b0953dff041ab134346ced0ebf30712f (patch)
tree94a151cfdfbc68971bc49be5d082ad4449632cf5 /chrome/browser
parent99d28d2f5f6ed613eddd80e29a235498096f41f4 (diff)
downloadchromium_src-22e9fcb4b0953dff041ab134346ced0ebf30712f.zip
chromium_src-22e9fcb4b0953dff041ab134346ced0ebf30712f.tar.gz
chromium_src-22e9fcb4b0953dff041ab134346ced0ebf30712f.tar.bz2
Send a notification when we connect to p2p
BUG=38563 TEST=Follow the instructions on the bug. Review URL: http://codereview.chromium.org/1545024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/sync/notifier/listener/talk_mediator_impl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/sync/notifier/listener/talk_mediator_impl.cc b/chrome/browser/sync/notifier/listener/talk_mediator_impl.cc
index c2aff57..a68d306 100644
--- a/chrome/browser/sync/notifier/listener/talk_mediator_impl.cc
+++ b/chrome/browser/sync/notifier/listener/talk_mediator_impl.cc
@@ -243,6 +243,11 @@ void TalkMediatorImpl::OnSubscriptionSuccess() {
state_.subscribed = 1;
TalkMediatorEvent event = { TalkMediatorEvent::SUBSCRIPTIONS_ON };
channel_->NotifyListeners(event);
+ // Send an initial nudge when we connect. This is to deal with the
+ // case that there are unsynced changes when Chromium starts up. This would
+ // caused changes to be submitted before p2p is enabled, and therefore
+ // the notification won't get sent out.
+ mediator_thread_->SendNotification();
}
void TalkMediatorImpl::OnSubscriptionFailure() {