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

Unified Diff: chrome/browser/ui/webui/sync_internals_message_handler.cc

Issue 1334173006: Move sync_internals resources and constants to //components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gcmInternals
Patch Set: Rebase Created 5 years, 3 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/ui/webui/sync_internals_message_handler.cc
diff --git a/chrome/browser/ui/webui/sync_internals_message_handler.cc b/chrome/browser/ui/webui/sync_internals_message_handler.cc
index f7ef135784009a42b9b5db148364c19af887c377..c6dc05aaadea34c2a82930e5620937d358d3a74b 100644
--- a/chrome/browser/ui/webui/sync_internals_message_handler.cc
+++ b/chrome/browser/ui/webui/sync_internals_message_handler.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/common/channel_info.h"
#include "components/sync_driver/about_sync_util.h"
+#include "components/sync_driver/about_sync_util.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_ui.h"
#include "sync/internal_api/public/events/protocol_event.h"
@@ -50,27 +51,27 @@ void SyncInternalsMessageHandler::RegisterMessages() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
web_ui()->RegisterMessageCallback(
- "registerForEvents",
+ sync_driver::sync_ui_util::kRegisterForEvents,
base::Bind(&SyncInternalsMessageHandler::HandleRegisterForEvents,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "registerForPerTypeCounters",
+ sync_driver::sync_ui_util::kRegisterForPerTypeCounters,
base::Bind(&SyncInternalsMessageHandler::HandleRegisterForPerTypeCounters,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "requestUpdatedAboutInfo",
+ sync_driver::sync_ui_util::kRequestUpdatedAboutInfo,
base::Bind(&SyncInternalsMessageHandler::HandleRequestUpdatedAboutInfo,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "requestListOfTypes",
+ sync_driver::sync_ui_util::kRequestListOfTypes,
base::Bind(&SyncInternalsMessageHandler::HandleRequestListOfTypes,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "getAllNodes",
+ sync_driver::sync_ui_util::kGetAllNodes,
base::Bind(&SyncInternalsMessageHandler::HandleGetAllNodes,
base::Unretained(this)));
}
@@ -124,10 +125,10 @@ void SyncInternalsMessageHandler::HandleRequestListOfTypes(
it.Good(); it.Inc()) {
type_list->Append(new base::StringValue(ModelTypeToString(it.Get())));
}
- event_details.Set("types", type_list.release());
+ event_details.Set(sync_driver::sync_ui_util::kTypes, type_list.release());
web_ui()->CallJavascriptFunction(
- "chrome.sync.dispatchEvent",
- base::StringValue("onReceivedListOfTypes"),
+ sync_driver::sync_ui_util::kDispatchEvent,
+ base::StringValue(sync_driver::sync_ui_util::kOnReceivedListOfTypes),
event_details);
}
@@ -150,8 +151,8 @@ void SyncInternalsMessageHandler::OnReceivedAllNodes(
int request_id,
scoped_ptr<base::ListValue> nodes) {
base::FundamentalValue id(request_id);
- web_ui()->CallJavascriptFunction("chrome.sync.getAllNodesCallback",
- id, *nodes);
+ web_ui()->CallJavascriptFunction(
+ sync_driver::sync_ui_util::kGetAllNodesCallback, id, *nodes);
}
void SyncInternalsMessageHandler::OnStateChanged() {
@@ -163,27 +164,29 @@ void SyncInternalsMessageHandler::OnProtocolEvent(
scoped_ptr<base::DictionaryValue> value(
syncer::ProtocolEvent::ToValue(event));
web_ui()->CallJavascriptFunction(
- "chrome.sync.dispatchEvent",
- base::StringValue("onProtocolEvent"),
- *value);
+ sync_driver::sync_ui_util::kDispatchEvent,
+ base::StringValue(sync_driver::sync_ui_util::kOnProtocolEvent), *value);
}
void SyncInternalsMessageHandler::OnCommitCountersUpdated(
syncer::ModelType type,
const syncer::CommitCounters& counters) {
- EmitCounterUpdate(type, "commit", counters.ToValue());
+ EmitCounterUpdate(type, sync_driver::sync_ui_util::kCommit,
+ counters.ToValue());
}
void SyncInternalsMessageHandler::OnUpdateCountersUpdated(
syncer::ModelType type,
const syncer::UpdateCounters& counters) {
- EmitCounterUpdate(type, "update", counters.ToValue());
+ EmitCounterUpdate(type, sync_driver::sync_ui_util::kUpdate,
+ counters.ToValue());
}
void SyncInternalsMessageHandler::OnStatusCountersUpdated(
syncer::ModelType type,
const syncer::StatusCounters& counters) {
- EmitCounterUpdate(type, "status", counters.ToValue());
+ EmitCounterUpdate(type, sync_driver::sync_ui_util::kStatus,
+ counters.ToValue());
}
void SyncInternalsMessageHandler::EmitCounterUpdate(
@@ -191,12 +194,14 @@ void SyncInternalsMessageHandler::EmitCounterUpdate(
const std::string& counter_type,
scoped_ptr<base::DictionaryValue> value) {
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue());
- details->SetString("modelType", ModelTypeToString(type));
- details->SetString("counterType", counter_type);
- details->Set("counters", value.release());
- web_ui()->CallJavascriptFunction("chrome.sync.dispatchEvent",
- base::StringValue("onCountersUpdated"),
- *details);
+ 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());
+ web_ui()->CallJavascriptFunction(
+ sync_driver::sync_ui_util::kDispatchEvent,
+ base::StringValue(sync_driver::sync_ui_util::kOnCountersUpdated),
+ *details);
}
void SyncInternalsMessageHandler::HandleJsEvent(
@@ -204,20 +209,18 @@ void SyncInternalsMessageHandler::HandleJsEvent(
const JsEventDetails& details) {
DVLOG(1) << "Handling event: " << name
<< " with details " << details.ToString();
- web_ui()->CallJavascriptFunction("chrome.sync.dispatchEvent",
- base::StringValue(name),
- details.Get());
+ web_ui()->CallJavascriptFunction(sync_driver::sync_ui_util::kDispatchEvent,
+ base::StringValue(name), details.Get());
}
void SyncInternalsMessageHandler::SendAboutInfo() {
ProfileSyncService* sync_service = GetProfileSyncService();
scoped_ptr<base::DictionaryValue> value =
- sync_ui_util::ConstructAboutInformation(sync_service,
- sync_service->signin(),
- chrome::GetChannel());
+ sync_driver::sync_ui_util::ConstructAboutInformation(
+ sync_service, sync_service->signin(), chrome::GetChannel());
web_ui()->CallJavascriptFunction(
- "chrome.sync.dispatchEvent",
- base::StringValue("onAboutInfoUpdated"),
+ sync_driver::sync_ui_util::kDispatchEvent,
+ base::StringValue(sync_driver::sync_ui_util::kOnAboutInfoUpdated),
*value);
}
« no previous file with comments | « chrome/browser/sync/test/integration/profile_sync_service_harness.cc ('k') | chrome/browser/ui/webui/sync_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698