| 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);
|
|
|