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

Side by Side Diff: chrome/browser/sync/js_sync_manager_observer.cc

Issue 6537027: Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/sync/js_sync_manager_observer.h" 5 #include "chrome/browser/sync/js_sync_manager_observer.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/sync/js_arg_list.h" 11 #include "chrome/browser/sync/js_arg_list.h"
12 #include "chrome/browser/sync/js_event_router.h" 12 #include "chrome/browser/sync/js_event_router.h"
13 #include "chrome/browser/sync/sessions/session_state.h" 13 #include "chrome/browser/sync/sessions/session_state.h"
14 #include "chrome/browser/sync/syncable/model_type.h" 14 #include "chrome/browser/sync/syncable/model_type.h"
15 #include "chrome/browser/sync/sessions/session_state.h"
15 16
16 namespace browser_sync { 17 namespace browser_sync {
17 18
18 JsSyncManagerObserver::JsSyncManagerObserver(JsEventRouter* parent_router) 19 JsSyncManagerObserver::JsSyncManagerObserver(JsEventRouter* parent_router)
19 : parent_router_(parent_router) { 20 : parent_router_(parent_router) {
20 DCHECK(parent_router_); 21 DCHECK(parent_router_);
21 } 22 }
22 23
23 JsSyncManagerObserver::~JsSyncManagerObserver() {} 24 JsSyncManagerObserver::~JsSyncManagerObserver() {}
24 25
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 80 }
80 81
81 void JsSyncManagerObserver::OnPassphraseAccepted( 82 void JsSyncManagerObserver::OnPassphraseAccepted(
82 const std::string& bootstrap_token) { 83 const std::string& bootstrap_token) {
83 ListValue return_args; 84 ListValue return_args;
84 return_args.Append(Value::CreateStringValue("<redacted>")); 85 return_args.Append(Value::CreateStringValue("<redacted>"));
85 parent_router_->RouteJsEvent("onPassphraseAccepted", 86 parent_router_->RouteJsEvent("onPassphraseAccepted",
86 JsArgList(return_args), NULL); 87 JsArgList(return_args), NULL);
87 } 88 }
88 89
89 void JsSyncManagerObserver::OnEncryptionComplete(
90 const syncable::ModelTypeSet& encrypted_types) {
91 ListValue return_args;
92 return_args.Append(syncable::ModelTypeSetToValue(encrypted_types));
93 parent_router_->RouteJsEvent("onEncryptionComplete",
94 JsArgList(return_args), NULL);
95 }
96
97 void JsSyncManagerObserver::OnInitializationComplete() { 90 void JsSyncManagerObserver::OnInitializationComplete() {
98 parent_router_->RouteJsEvent("onInitializationComplete", 91 parent_router_->RouteJsEvent("onInitializationComplete",
99 JsArgList(), NULL); 92 JsArgList(), NULL);
100 } 93 }
101 94
102 void JsSyncManagerObserver::OnPaused() { 95 void JsSyncManagerObserver::OnPaused() {
103 parent_router_->RouteJsEvent("onPaused", JsArgList(), NULL); 96 parent_router_->RouteJsEvent("onPaused", JsArgList(), NULL);
104 } 97 }
105 98
106 void JsSyncManagerObserver::OnResumed() { 99 void JsSyncManagerObserver::OnResumed() {
107 parent_router_->RouteJsEvent("onResumed", JsArgList(), NULL); 100 parent_router_->RouteJsEvent("onResumed", JsArgList(), NULL);
108 } 101 }
109 102
110 void JsSyncManagerObserver::OnStopSyncingPermanently() { 103 void JsSyncManagerObserver::OnStopSyncingPermanently() {
111 parent_router_->RouteJsEvent("onStopSyncingPermanently", 104 parent_router_->RouteJsEvent("onStopSyncingPermanently",
112 JsArgList(), NULL); 105 JsArgList(), NULL);
113 } 106 }
114 107
115 void JsSyncManagerObserver::OnClearServerDataSucceeded() { 108 void JsSyncManagerObserver::OnClearServerDataSucceeded() {
116 parent_router_->RouteJsEvent("onClearServerDataSucceeded", 109 parent_router_->RouteJsEvent("onClearServerDataSucceeded",
117 JsArgList(), NULL); 110 JsArgList(), NULL);
118 } 111 }
119 112
120 void JsSyncManagerObserver::OnClearServerDataFailed() { 113 void JsSyncManagerObserver::OnClearServerDataFailed() {
121 parent_router_->RouteJsEvent("onClearServerDataFailed", JsArgList(), NULL); 114 parent_router_->RouteJsEvent("onClearServerDataFailed", JsArgList(), NULL);
122 } 115 }
123 116
124 } // namespace browser_sync 117 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/js_sync_manager_observer.h ('k') | chrome/browser/sync/js_sync_manager_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698