| Index: components/sync/core_impl/js_sync_encryption_handler_observer.cc
|
| diff --git a/sync/internal_api/js_sync_encryption_handler_observer.cc b/components/sync/core_impl/js_sync_encryption_handler_observer.cc
|
| similarity index 69%
|
| rename from sync/internal_api/js_sync_encryption_handler_observer.cc
|
| rename to components/sync/core_impl/js_sync_encryption_handler_observer.cc
|
| index 7924d31f283a4877988aacd1b602914e7135b1fe..c60a3ea21a1f68d3554b59faa63b58f99431d6a0 100644
|
| --- a/sync/internal_api/js_sync_encryption_handler_observer.cc
|
| +++ b/components/sync/core_impl/js_sync_encryption_handler_observer.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/js_sync_encryption_handler_observer.h"
|
| +#include "components/sync/core_impl/js_sync_encryption_handler_observer.h"
|
|
|
| #include <cstddef>
|
|
|
| @@ -10,12 +10,12 @@
|
| #include "base/logging.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/values.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/util/sync_string_conversions.h"
|
| -#include "sync/js/js_event_details.h"
|
| -#include "sync/js/js_event_handler.h"
|
| -#include "sync/util/cryptographer.h"
|
| -#include "sync/util/time.h"
|
| +#include "components/sync/base/cryptographer.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_string_conversions.h"
|
| +#include "components/sync/base/time.h"
|
| +#include "components/sync/js/js_event_details.h"
|
| +#include "components/sync/js/js_event_handler.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -35,8 +35,7 @@ void JsSyncEncryptionHandlerObserver::OnPassphraseRequired(
|
| return;
|
| }
|
| base::DictionaryValue details;
|
| - details.SetString("reason",
|
| - PassphraseRequiredReasonToString(reason));
|
| + details.SetString("reason", PassphraseRequiredReasonToString(reason));
|
| HandleJsEvent(FROM_HERE, "onPassphraseRequired", JsEventDetails(&details));
|
| }
|
|
|
| @@ -67,11 +66,9 @@ void JsSyncEncryptionHandlerObserver::OnEncryptedTypesChanged(
|
| return;
|
| }
|
| base::DictionaryValue details;
|
| - details.Set("encryptedTypes",
|
| - ModelTypeSetToValue(encrypted_types));
|
| + details.Set("encryptedTypes", ModelTypeSetToValue(encrypted_types));
|
| details.SetBoolean("encryptEverything", encrypt_everything);
|
| - HandleJsEvent(FROM_HERE,
|
| - "onEncryptedTypesChanged", JsEventDetails(&details));
|
| + HandleJsEvent(FROM_HERE, "onEncryptedTypesChanged", JsEventDetails(&details));
|
| }
|
|
|
| void JsSyncEncryptionHandlerObserver::OnEncryptionComplete() {
|
| @@ -88,12 +85,9 @@ void JsSyncEncryptionHandlerObserver::OnCryptographerStateChanged(
|
| return;
|
| }
|
| base::DictionaryValue details;
|
| - details.SetBoolean("ready",
|
| - cryptographer->is_ready());
|
| - details.SetBoolean("hasPendingKeys",
|
| - cryptographer->has_pending_keys());
|
| - HandleJsEvent(FROM_HERE,
|
| - "onCryptographerStateChanged",
|
| + details.SetBoolean("ready", cryptographer->is_ready());
|
| + details.SetBoolean("hasPendingKeys", cryptographer->has_pending_keys());
|
| + HandleJsEvent(FROM_HERE, "onCryptographerStateChanged",
|
| JsEventDetails(&details));
|
| }
|
|
|
| @@ -104,28 +98,24 @@ void JsSyncEncryptionHandlerObserver::OnPassphraseTypeChanged(
|
| return;
|
| }
|
| base::DictionaryValue details;
|
| - details.SetString("passphraseType",
|
| - PassphraseTypeToString(type));
|
| + details.SetString("passphraseType", PassphraseTypeToString(type));
|
| details.SetInteger("explicitPassphraseTime",
|
| TimeToProtoTime(explicit_passphrase_time));
|
| - HandleJsEvent(FROM_HERE,
|
| - "onPassphraseTypeChanged",
|
| - JsEventDetails(&details));
|
| + HandleJsEvent(FROM_HERE, "onPassphraseTypeChanged", JsEventDetails(&details));
|
| }
|
|
|
| void JsSyncEncryptionHandlerObserver::OnLocalSetPassphraseEncryption(
|
| - const SyncEncryptionHandler::NigoriState& nigori_state) {
|
| -}
|
| + const SyncEncryptionHandler::NigoriState& nigori_state) {}
|
|
|
| void JsSyncEncryptionHandlerObserver::HandleJsEvent(
|
| const tracked_objects::Location& from_here,
|
| - const std::string& name, const JsEventDetails& details) {
|
| + const std::string& name,
|
| + const JsEventDetails& details) {
|
| if (!event_handler_.IsInitialized()) {
|
| NOTREACHED();
|
| return;
|
| }
|
| - event_handler_.Call(from_here,
|
| - &JsEventHandler::HandleJsEvent, name, details);
|
| + event_handler_.Call(from_here, &JsEventHandler::HandleJsEvent, name, details);
|
| }
|
|
|
| } // namespace syncer
|
|
|