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

Side by Side Diff: sync/internal_api/js_sync_manager_observer.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
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/internal_api/js_sync_manager_observer.h" 5 #include "sync/internal_api/js_sync_manager_observer.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "sync/internal_api/public/base/model_type.h" 13 #include "sync/internal_api/public/base/model_type.h"
14 #include "sync/internal_api/public/change_record.h" 14 #include "sync/internal_api/public/change_record.h"
15 #include "sync/internal_api/public/sessions/sync_session_snapshot.h" 15 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
16 #include "sync/internal_api/public/util/sync_string_conversions.h" 16 #include "sync/internal_api/public/util/sync_string_conversions.h"
17 #include "sync/js/js_arg_list.h" 17 #include "sync/js/js_arg_list.h"
18 #include "sync/js/js_event_details.h" 18 #include "sync/js/js_event_details.h"
19 #include "sync/js/js_event_handler.h" 19 #include "sync/js/js_event_handler.h"
20 #include "sync/sessions/session_state.h" 20 #include "sync/sessions/session_state.h"
21 21
22 namespace syncer { 22 namespace syncer {
23 23
24 using syncer::SyncProtocolError;
25
26 JsSyncManagerObserver::JsSyncManagerObserver() {} 24 JsSyncManagerObserver::JsSyncManagerObserver() {}
27 25
28 JsSyncManagerObserver::~JsSyncManagerObserver() {} 26 JsSyncManagerObserver::~JsSyncManagerObserver() {}
29 27
30 void JsSyncManagerObserver::SetJsEventHandler( 28 void JsSyncManagerObserver::SetJsEventHandler(
31 const WeakHandle<JsEventHandler>& event_handler) { 29 const WeakHandle<JsEventHandler>& event_handler) {
32 event_handler_ = event_handler; 30 event_handler_ = event_handler;
33 } 31 }
34 32
35 void JsSyncManagerObserver::OnSyncCycleCompleted( 33 void JsSyncManagerObserver::OnSyncCycleCompleted(
36 const sessions::SyncSessionSnapshot& snapshot) { 34 const sessions::SyncSessionSnapshot& snapshot) {
37 if (!event_handler_.IsInitialized()) { 35 if (!event_handler_.IsInitialized()) {
38 return; 36 return;
39 } 37 }
40 DictionaryValue details; 38 DictionaryValue details;
41 details.Set("snapshot", snapshot.ToValue()); 39 details.Set("snapshot", snapshot.ToValue());
42 HandleJsEvent(FROM_HERE, "onSyncCycleCompleted", JsEventDetails(&details)); 40 HandleJsEvent(FROM_HERE, "onSyncCycleCompleted", JsEventDetails(&details));
43 } 41 }
44 42
45 void JsSyncManagerObserver::OnConnectionStatusChange( 43 void JsSyncManagerObserver::OnConnectionStatusChange(ConnectionStatus status) {
46 syncer::ConnectionStatus status) {
47 if (!event_handler_.IsInitialized()) { 44 if (!event_handler_.IsInitialized()) {
48 return; 45 return;
49 } 46 }
50 DictionaryValue details; 47 DictionaryValue details;
51 details.SetString("status", syncer::ConnectionStatusToString(status)); 48 details.SetString("status", ConnectionStatusToString(status));
52 HandleJsEvent(FROM_HERE, 49 HandleJsEvent(FROM_HERE,
53 "onConnectionStatusChange", JsEventDetails(&details)); 50 "onConnectionStatusChange", JsEventDetails(&details));
54 } 51 }
55 52
56 void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) { 53 void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) {
57 if (!event_handler_.IsInitialized()) { 54 if (!event_handler_.IsInitialized()) {
58 return; 55 return;
59 } 56 }
60 DictionaryValue details; 57 DictionaryValue details;
61 details.SetString("token", "<redacted>"); 58 details.SetString("token", "<redacted>");
62 HandleJsEvent(FROM_HERE, "onUpdatedToken", JsEventDetails(&details)); 59 HandleJsEvent(FROM_HERE, "onUpdatedToken", JsEventDetails(&details));
63 } 60 }
64 61
65 void JsSyncManagerObserver::OnPassphraseRequired( 62 void JsSyncManagerObserver::OnPassphraseRequired(
66 syncer::PassphraseRequiredReason reason, 63 PassphraseRequiredReason reason,
67 const sync_pb::EncryptedData& pending_keys) { 64 const sync_pb::EncryptedData& pending_keys) {
68 if (!event_handler_.IsInitialized()) { 65 if (!event_handler_.IsInitialized()) {
69 return; 66 return;
70 } 67 }
71 DictionaryValue details; 68 DictionaryValue details;
72 details.SetString("reason", 69 details.SetString("reason",
73 syncer::PassphraseRequiredReasonToString(reason)); 70 PassphraseRequiredReasonToString(reason));
74 HandleJsEvent(FROM_HERE, "onPassphraseRequired", JsEventDetails(&details)); 71 HandleJsEvent(FROM_HERE, "onPassphraseRequired", JsEventDetails(&details));
75 } 72 }
76 73
77 void JsSyncManagerObserver::OnPassphraseAccepted() { 74 void JsSyncManagerObserver::OnPassphraseAccepted() {
78 if (!event_handler_.IsInitialized()) { 75 if (!event_handler_.IsInitialized()) {
79 return; 76 return;
80 } 77 }
81 DictionaryValue details; 78 DictionaryValue details;
82 HandleJsEvent(FROM_HERE, "onPassphraseAccepted", JsEventDetails(&details)); 79 HandleJsEvent(FROM_HERE, "onPassphraseAccepted", JsEventDetails(&details));
83 } 80 }
84 81
85 void JsSyncManagerObserver::OnBootstrapTokenUpdated( 82 void JsSyncManagerObserver::OnBootstrapTokenUpdated(
86 const std::string& boostrap_token) { 83 const std::string& boostrap_token) {
87 if (!event_handler_.IsInitialized()) { 84 if (!event_handler_.IsInitialized()) {
88 return; 85 return;
89 } 86 }
90 DictionaryValue details; 87 DictionaryValue details;
91 details.SetString("bootstrapToken", "<redacted>"); 88 details.SetString("bootstrapToken", "<redacted>");
92 HandleJsEvent(FROM_HERE, "OnBootstrapTokenUpdated", JsEventDetails(&details)); 89 HandleJsEvent(FROM_HERE, "OnBootstrapTokenUpdated", JsEventDetails(&details));
93 } 90 }
94 91
95 void JsSyncManagerObserver::OnEncryptedTypesChanged( 92 void JsSyncManagerObserver::OnEncryptedTypesChanged(
96 syncer::ModelTypeSet encrypted_types, 93 ModelTypeSet encrypted_types,
97 bool encrypt_everything) { 94 bool encrypt_everything) {
98 if (!event_handler_.IsInitialized()) { 95 if (!event_handler_.IsInitialized()) {
99 return; 96 return;
100 } 97 }
101 DictionaryValue details; 98 DictionaryValue details;
102 details.Set("encryptedTypes", 99 details.Set("encryptedTypes",
103 syncer::ModelTypeSetToValue(encrypted_types)); 100 ModelTypeSetToValue(encrypted_types));
104 details.SetBoolean("encryptEverything", encrypt_everything); 101 details.SetBoolean("encryptEverything", encrypt_everything);
105 HandleJsEvent(FROM_HERE, 102 HandleJsEvent(FROM_HERE,
106 "onEncryptedTypesChanged", JsEventDetails(&details)); 103 "onEncryptedTypesChanged", JsEventDetails(&details));
107 } 104 }
108 105
109 void JsSyncManagerObserver::OnEncryptionComplete() { 106 void JsSyncManagerObserver::OnEncryptionComplete() {
110 if (!event_handler_.IsInitialized()) { 107 if (!event_handler_.IsInitialized()) {
111 return; 108 return;
112 } 109 }
113 DictionaryValue details; 110 DictionaryValue details;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 const std::string& name, const JsEventDetails& details) { 145 const std::string& name, const JsEventDetails& details) {
149 if (!event_handler_.IsInitialized()) { 146 if (!event_handler_.IsInitialized()) {
150 NOTREACHED(); 147 NOTREACHED();
151 return; 148 return;
152 } 149 }
153 event_handler_.Call(from_here, 150 event_handler_.Call(from_here,
154 &JsEventHandler::HandleJsEvent, name, details); 151 &JsEventHandler::HandleJsEvent, name, details);
155 } 152 }
156 153
157 } // namespace syncer 154 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/js_sync_manager_observer.h ('k') | sync/internal_api/js_sync_manager_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698