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

Side by Side Diff: sync/notifier/sync_notifier_factory.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/notifier/sync_notifier_factory.h ('k') | sync/notifier/sync_notifier_factory_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/notifier/sync_notifier_factory.h" 5 #include "sync/notifier/sync_notifier_factory.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "jingle/notifier/listener/push_client.h" 10 #include "jingle/notifier/listener/push_client.h"
11 #include "sync/notifier/non_blocking_invalidation_notifier.h" 11 #include "sync/notifier/non_blocking_invalidation_notifier.h"
12 #include "sync/notifier/p2p_notifier.h" 12 #include "sync/notifier/p2p_notifier.h"
13 #include "sync/notifier/sync_notifier.h" 13 #include "sync/notifier/sync_notifier.h"
14 14
15 namespace syncer { 15 namespace syncer {
16 namespace { 16 namespace {
17 17
18 SyncNotifier* CreateDefaultSyncNotifier( 18 SyncNotifier* CreateDefaultSyncNotifier(
19 const notifier::NotifierOptions& notifier_options, 19 const notifier::NotifierOptions& notifier_options,
20 const InvalidationVersionMap& initial_max_invalidation_versions, 20 const InvalidationVersionMap& initial_max_invalidation_versions,
21 const std::string& initial_invalidation_state, 21 const std::string& initial_invalidation_state,
22 const syncer::WeakHandle<InvalidationStateTracker>& 22 const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker,
23 invalidation_state_tracker,
24 const std::string& client_info) { 23 const std::string& client_info) {
25 if (notifier_options.notification_method == notifier::NOTIFICATION_P2P) { 24 if (notifier_options.notification_method == notifier::NOTIFICATION_P2P) {
26 // TODO(rlarocque): Ideally, the notification target would be 25 // TODO(rlarocque): Ideally, the notification target would be
27 // NOTIFY_OTHERS. There's no good reason to notify ourselves of our own 26 // NOTIFY_OTHERS. There's no good reason to notify ourselves of our own
28 // commits. We self-notify for now only because the integration tests rely 27 // commits. We self-notify for now only because the integration tests rely
29 // on this behaviour. See crbug.com/97780. 28 // on this behaviour. See crbug.com/97780.
30 return new P2PNotifier( 29 return new P2PNotifier(
31 notifier::PushClient::CreateDefault(notifier_options), 30 notifier::PushClient::CreateDefault(notifier_options),
32 NOTIFY_ALL); 31 NOTIFY_ALL);
33 } 32 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 return NULL; 66 return NULL;
68 #else 67 #else
69 return CreateDefaultSyncNotifier(notifier_options_, 68 return CreateDefaultSyncNotifier(notifier_options_,
70 initial_max_invalidation_versions_, 69 initial_max_invalidation_versions_,
71 initial_invalidation_state_, 70 initial_invalidation_state_,
72 invalidation_state_tracker_, 71 invalidation_state_tracker_,
73 client_info_); 72 client_info_);
74 #endif 73 #endif
75 } 74 }
76 } // namespace syncer 75 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/notifier/sync_notifier_factory.h ('k') | sync/notifier/sync_notifier_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698