| Index: ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
|
| diff --git a/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc b/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
|
| index deebef123bf43eef5cf4f83b29c908e8e705ea61..97060f10179b3b9d6c5b454ebbca311e8231492d 100644
|
| --- a/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
|
| +++ b/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
|
| @@ -37,7 +37,7 @@ SyncInternalsMessageHandler::~SyncInternalsMessageHandler() {
|
| if (js_controller_)
|
| js_controller_->RemoveJsEventHandler(this);
|
|
|
| - sync_driver::SyncService* service = GetSyncService();
|
| + syncer::SyncService* service = GetSyncService();
|
| if (service && service->HasObserver(this)) {
|
| service->RemoveObserver(this);
|
| service->RemoveProtocolEventObserver(this);
|
| @@ -52,27 +52,27 @@ void SyncInternalsMessageHandler::RegisterMessages() {
|
| DCHECK_CURRENTLY_ON(web::WebThread::UI);
|
|
|
| web_ui()->RegisterMessageCallback(
|
| - sync_driver::sync_ui_util::kRegisterForEvents,
|
| + syncer::sync_ui_util::kRegisterForEvents,
|
| base::Bind(&SyncInternalsMessageHandler::HandleRegisterForEvents,
|
| base::Unretained(this)));
|
|
|
| web_ui()->RegisterMessageCallback(
|
| - sync_driver::sync_ui_util::kRegisterForPerTypeCounters,
|
| + syncer::sync_ui_util::kRegisterForPerTypeCounters,
|
| base::Bind(&SyncInternalsMessageHandler::HandleRegisterForPerTypeCounters,
|
| base::Unretained(this)));
|
|
|
| web_ui()->RegisterMessageCallback(
|
| - sync_driver::sync_ui_util::kRequestUpdatedAboutInfo,
|
| + syncer::sync_ui_util::kRequestUpdatedAboutInfo,
|
| base::Bind(&SyncInternalsMessageHandler::HandleRequestUpdatedAboutInfo,
|
| base::Unretained(this)));
|
|
|
| web_ui()->RegisterMessageCallback(
|
| - sync_driver::sync_ui_util::kRequestListOfTypes,
|
| + syncer::sync_ui_util::kRequestListOfTypes,
|
| base::Bind(&SyncInternalsMessageHandler::HandleRequestListOfTypes,
|
| base::Unretained(this)));
|
|
|
| web_ui()->RegisterMessageCallback(
|
| - sync_driver::sync_ui_util::kGetAllNodes,
|
| + syncer::sync_ui_util::kGetAllNodes,
|
| base::Bind(&SyncInternalsMessageHandler::HandleGetAllNodes,
|
| base::Unretained(this)));
|
| }
|
| @@ -84,7 +84,7 @@ void SyncInternalsMessageHandler::HandleRegisterForEvents(
|
| // is_registered_ flag protects us from double-registering. This could
|
| // happen on a page refresh, where the JavaScript gets re-run but the
|
| // message handler remains unchanged.
|
| - sync_driver::SyncService* service = GetSyncService();
|
| + syncer::SyncService* service = GetSyncService();
|
| if (service && !is_registered_) {
|
| service->AddObserver(this);
|
| service->AddProtocolEventObserver(this);
|
| @@ -98,7 +98,7 @@ void SyncInternalsMessageHandler::HandleRegisterForPerTypeCounters(
|
| const base::ListValue* args) {
|
| DCHECK(args->empty());
|
|
|
| - if (sync_driver::SyncService* service = GetSyncService()) {
|
| + if (syncer::SyncService* service = GetSyncService()) {
|
| if (!is_registered_for_counters_) {
|
| service->AddTypeDebugInfoObserver(this);
|
| is_registered_for_counters_ = true;
|
| @@ -126,10 +126,10 @@ void SyncInternalsMessageHandler::HandleRequestListOfTypes(
|
| it.Inc()) {
|
| type_list->Append(new base::StringValue(ModelTypeToString(it.Get())));
|
| }
|
| - event_details.Set(sync_driver::sync_ui_util::kTypes, type_list.release());
|
| + event_details.Set(syncer::sync_ui_util::kTypes, type_list.release());
|
| web_ui()->CallJavascriptFunction(
|
| - sync_driver::sync_ui_util::kDispatchEvent,
|
| - base::StringValue(sync_driver::sync_ui_util::kOnReceivedListOfTypes),
|
| + syncer::sync_ui_util::kDispatchEvent,
|
| + base::StringValue(syncer::sync_ui_util::kOnReceivedListOfTypes),
|
| event_details);
|
| }
|
|
|
| @@ -140,7 +140,7 @@ void SyncInternalsMessageHandler::HandleGetAllNodes(
|
| bool success = args->GetInteger(0, &request_id);
|
| DCHECK(success);
|
|
|
| - sync_driver::SyncService* service = GetSyncService();
|
| + syncer::SyncService* service = GetSyncService();
|
| if (service) {
|
| service->GetAllNodes(
|
| base::Bind(&SyncInternalsMessageHandler::OnReceivedAllNodes,
|
| @@ -152,8 +152,8 @@ void SyncInternalsMessageHandler::OnReceivedAllNodes(
|
| int request_id,
|
| std::unique_ptr<base::ListValue> nodes) {
|
| base::FundamentalValue id(request_id);
|
| - web_ui()->CallJavascriptFunction(
|
| - sync_driver::sync_ui_util::kGetAllNodesCallback, id, *nodes);
|
| + web_ui()->CallJavascriptFunction(syncer::sync_ui_util::kGetAllNodesCallback,
|
| + id, *nodes);
|
| }
|
|
|
| void SyncInternalsMessageHandler::OnStateChanged() {
|
| @@ -165,29 +165,26 @@ void SyncInternalsMessageHandler::OnProtocolEvent(
|
| std::unique_ptr<base::DictionaryValue> value(
|
| syncer::ProtocolEvent::ToValue(event));
|
| web_ui()->CallJavascriptFunction(
|
| - sync_driver::sync_ui_util::kDispatchEvent,
|
| - base::StringValue(sync_driver::sync_ui_util::kOnProtocolEvent), *value);
|
| + syncer::sync_ui_util::kDispatchEvent,
|
| + base::StringValue(syncer::sync_ui_util::kOnProtocolEvent), *value);
|
| }
|
|
|
| void SyncInternalsMessageHandler::OnCommitCountersUpdated(
|
| syncer::ModelType type,
|
| const syncer::CommitCounters& counters) {
|
| - EmitCounterUpdate(type, sync_driver::sync_ui_util::kCommit,
|
| - counters.ToValue());
|
| + EmitCounterUpdate(type, syncer::sync_ui_util::kCommit, counters.ToValue());
|
| }
|
|
|
| void SyncInternalsMessageHandler::OnUpdateCountersUpdated(
|
| syncer::ModelType type,
|
| const syncer::UpdateCounters& counters) {
|
| - EmitCounterUpdate(type, sync_driver::sync_ui_util::kUpdate,
|
| - counters.ToValue());
|
| + EmitCounterUpdate(type, syncer::sync_ui_util::kUpdate, counters.ToValue());
|
| }
|
|
|
| void SyncInternalsMessageHandler::OnStatusCountersUpdated(
|
| syncer::ModelType type,
|
| const syncer::StatusCounters& counters) {
|
| - EmitCounterUpdate(type, sync_driver::sync_ui_util::kStatus,
|
| - counters.ToValue());
|
| + EmitCounterUpdate(type, syncer::sync_ui_util::kStatus, counters.ToValue());
|
| }
|
|
|
| void SyncInternalsMessageHandler::EmitCounterUpdate(
|
| @@ -195,21 +192,19 @@ void SyncInternalsMessageHandler::EmitCounterUpdate(
|
| const std::string& counter_type,
|
| std::unique_ptr<base::DictionaryValue> value) {
|
| std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue());
|
| - details->SetString(sync_driver::sync_ui_util::kModelType,
|
| - ModelTypeToString(type));
|
| - details->SetString(sync_driver::sync_ui_util::kCounterType, counter_type);
|
| - details->Set(sync_driver::sync_ui_util::kCounters, value.release());
|
| + details->SetString(syncer::sync_ui_util::kModelType, ModelTypeToString(type));
|
| + details->SetString(syncer::sync_ui_util::kCounterType, counter_type);
|
| + details->Set(syncer::sync_ui_util::kCounters, value.release());
|
| web_ui()->CallJavascriptFunction(
|
| - sync_driver::sync_ui_util::kDispatchEvent,
|
| - base::StringValue(sync_driver::sync_ui_util::kOnCountersUpdated),
|
| - *details);
|
| + syncer::sync_ui_util::kDispatchEvent,
|
| + base::StringValue(syncer::sync_ui_util::kOnCountersUpdated), *details);
|
| }
|
|
|
| void SyncInternalsMessageHandler::HandleJsEvent(const std::string& name,
|
| const JsEventDetails& details) {
|
| DVLOG(1) << "Handling event: " << name << " with details "
|
| << details.ToString();
|
| - web_ui()->CallJavascriptFunction(sync_driver::sync_ui_util::kDispatchEvent,
|
| + web_ui()->CallJavascriptFunction(syncer::sync_ui_util::kDispatchEvent,
|
| base::StringValue(name), details.Get());
|
| }
|
|
|
| @@ -218,18 +213,17 @@ void SyncInternalsMessageHandler::SendAboutInfo() {
|
| ios::ChromeBrowserState::FromWebUIIOS(web_ui());
|
| SigninManager* signin_manager =
|
| ios::SigninManagerFactory::GetForBrowserState(browser_state);
|
| - sync_driver::SyncService* sync_service = GetSyncService();
|
| + syncer::SyncService* sync_service = GetSyncService();
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - sync_driver::sync_ui_util::ConstructAboutInformation(
|
| + syncer::sync_ui_util::ConstructAboutInformation(
|
| sync_service, signin_manager, GetChannel());
|
| web_ui()->CallJavascriptFunction(
|
| - sync_driver::sync_ui_util::kDispatchEvent,
|
| - base::StringValue(sync_driver::sync_ui_util::kOnAboutInfoUpdated),
|
| - *value);
|
| + syncer::sync_ui_util::kDispatchEvent,
|
| + base::StringValue(syncer::sync_ui_util::kOnAboutInfoUpdated), *value);
|
| }
|
|
|
| // Gets the SyncService of the underlying original profile. May return null.
|
| -sync_driver::SyncService* SyncInternalsMessageHandler::GetSyncService() {
|
| +syncer::SyncService* SyncInternalsMessageHandler::GetSyncService() {
|
| ios::ChromeBrowserState* browser_state =
|
| ios::ChromeBrowserState::FromWebUIIOS(web_ui());
|
| return IOSChromeProfileSyncServiceFactory::GetForBrowserState(
|
|
|