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

Unified Diff: chrome/browser/sync/js_sync_manager_observer.cc

Issue 6465005: [Sync] Initial support for encrypting any datatype (no UI hookup yet). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + small fix 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/js_sync_manager_observer.cc
diff --git a/chrome/browser/sync/js_sync_manager_observer.cc b/chrome/browser/sync/js_sync_manager_observer.cc
index 407ce98c2e147768af91b475969d3e5aebad2e38..85fc5c491fd1bfc477b2129df4766188ef3601d8 100644
--- a/chrome/browser/sync/js_sync_manager_observer.cc
+++ b/chrome/browser/sync/js_sync_manager_observer.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/sync/js_event_router.h"
#include "chrome/browser/sync/sessions/session_state.h"
#include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/sync/sessions/session_state.h"
namespace browser_sync {
@@ -87,6 +86,14 @@ void JsSyncManagerObserver::OnPassphraseAccepted(
JsArgList(return_args), NULL);
}
+void JsSyncManagerObserver::OnEncryptionComplete(
+ const syncable::ModelTypeSet& encrypted_types) {
+ ListValue return_args;
+ return_args.Append(syncable::ModelTypeSetToValue(encrypted_types));
+ parent_router_->RouteJsEvent("onEncryptionComplete",
+ JsArgList(return_args), NULL);
+}
+
void JsSyncManagerObserver::OnInitializationComplete() {
parent_router_->RouteJsEvent("onInitializationComplete",
JsArgList(), NULL);
« 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