Commit 81865e4b authored by Dan Beam's avatar Dan Beam Committed by Commit Bot

Use FireWebUIListener() a little more

FireWebUIListener(name, ...) is essentially an alias for:

  CallJavascriptFunction("cr.webUIListenerCallback", base::Value(name), ...);

Using it reduces the amount of times we paste "cr.webUIListenerCallback" and
generally reduces the amount of parallel paths for notifying running web
UI pages.

R=aee@chromium.org
BUG=none

Change-Id: Id3ee2622949c0fd1bba9705655de4cb0faf386f4
Reviewed-on: https://chromium-review.googlesource.com/c/1431293Reviewed-by: default avatarEsmael El-Moslimany <aee@chromium.org>
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Auto-Submit: Dan Beam (slow until 1/29) <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625390}
parent e1d190a1
...@@ -392,9 +392,7 @@ void PowerHandler::SendPowerManagementSettings(bool force) { ...@@ -392,9 +392,7 @@ void PowerHandler::SendPowerManagementSettings(bool force) {
dict.SetInteger(kLidClosedBehaviorKey, lid_closed_behavior); dict.SetInteger(kLidClosedBehaviorKey, lid_closed_behavior);
dict.SetBoolean(kLidClosedControlledKey, lid_closed_controlled); dict.SetBoolean(kLidClosedControlledKey, lid_closed_controlled);
dict.SetBoolean(kHasLidKey, has_lid); dict.SetBoolean(kHasLidKey, has_lid);
CallJavascriptFunction("cr.webUIListenerCallback", FireWebUIListener(kPowerManagementSettingsChangedName, dict);
base::Value(kPowerManagementSettingsChangedName),
dict);
last_idle_behavior_ = idle_behavior; last_idle_behavior_ = idle_behavior;
last_idle_controlled_ = idle_controlled; last_idle_controlled_ = idle_controlled;
......
...@@ -108,10 +108,8 @@ const extensions::Extension* FontHandler::GetAdvancedFontSettingsExtension() { ...@@ -108,10 +108,8 @@ const extensions::Extension* FontHandler::GetAdvancedFontSettingsExtension() {
} }
void FontHandler::NotifyAdvancedFontSettingsAvailability() { void FontHandler::NotifyAdvancedFontSettingsAvailability() {
CallJavascriptFunction( FireWebUIListener("advanced-font-settings-installed",
"cr.webUIListenerCallback", base::Value(GetAdvancedFontSettingsExtension() != nullptr));
base::Value("advanced-font-settings-installed"),
base::Value(GetAdvancedFontSettingsExtension() != nullptr));
} }
void FontHandler::OnExtensionLoaded(content::BrowserContext*, void FontHandler::OnExtensionLoaded(content::BrowserContext*,
......
...@@ -339,8 +339,8 @@ void ClearBrowsingDataHandler::OnStateChanged(syncer::SyncService* sync) { ...@@ -339,8 +339,8 @@ void ClearBrowsingDataHandler::OnStateChanged(syncer::SyncService* sync) {
void ClearBrowsingDataHandler::UpdateSyncState() { void ClearBrowsingDataHandler::UpdateSyncState() {
identity::IdentityManager* identity_manager = identity::IdentityManager* identity_manager =
IdentityManagerFactory::GetForProfile(profile_); IdentityManagerFactory::GetForProfile(profile_);
CallJavascriptFunction( FireWebUIListener(
"cr.webUIListenerCallback", base::Value("update-sync-state"), "update-sync-state",
base::Value(identity_manager && identity_manager->HasPrimaryAccount()), base::Value(identity_manager && identity_manager->HasPrimaryAccount()),
base::Value(sync_service_ && sync_service_->IsSyncFeatureActive() && base::Value(sync_service_ && sync_service_->IsSyncFeatureActive() &&
sync_service_->GetActiveDataTypes().Has( sync_service_->GetActiveDataTypes().Has(
...@@ -383,9 +383,8 @@ void ClearBrowsingDataHandler::AddCounter( ...@@ -383,9 +383,8 @@ void ClearBrowsingDataHandler::AddCounter(
void ClearBrowsingDataHandler::UpdateCounterText( void ClearBrowsingDataHandler::UpdateCounterText(
std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) { std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
CallJavascriptFunction( FireWebUIListener(
"cr.webUIListenerCallback", base::Value("update-counter-text"), "update-counter-text", base::Value(result->source()->GetPrefName()),
base::Value(result->source()->GetPrefName()),
base::Value(browsing_data_counter_utils::GetChromeCounterTextFromResult( base::Value(browsing_data_counter_utils::GetChromeCounterTextFromResult(
result.get(), profile_))); result.get(), profile_)));
} }
......
...@@ -209,10 +209,9 @@ void ImportDataHandler::ImportEnded() { ...@@ -209,10 +209,9 @@ void ImportDataHandler::ImportEnded() {
importer_host_->set_observer(NULL); importer_host_->set_observer(NULL);
importer_host_ = NULL; importer_host_ = NULL;
CallJavascriptFunction( FireWebUIListener("import-data-status-changed",
"cr.webUIListenerCallback", base::Value("import-data-status-changed"), base::Value(import_did_succeed_ ? kImportStatusSucceeded
base::Value(import_did_succeed_ ? kImportStatusSucceeded : kImportStatusFailed));
: kImportStatusFailed));
} }
void ImportDataHandler::FileSelected(const base::FilePath& path, void ImportDataHandler::FileSelected(const base::FilePath& path,
......
...@@ -495,8 +495,7 @@ void SiteSettingsHandler::OnUsageCleared() { ...@@ -495,8 +495,7 @@ void SiteSettingsHandler::OnUsageCleared() {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
void SiteSettingsHandler::OnPrefEnableDrmChanged() { void SiteSettingsHandler::OnPrefEnableDrmChanged() {
CallJavascriptFunction("cr.webUIListenerCallback", FireWebUIListener("prefEnableDrmChanged");
base::Value("prefEnableDrmChanged"));
} }
#endif #endif
...@@ -509,15 +508,12 @@ void SiteSettingsHandler::OnContentSettingChanged( ...@@ -509,15 +508,12 @@ void SiteSettingsHandler::OnContentSettingChanged(
return; return;
if (primary_pattern.ToString().empty()) { if (primary_pattern.ToString().empty()) {
CallJavascriptFunction( FireWebUIListener("contentSettingCategoryChanged",
"cr.webUIListenerCallback", base::Value(site_settings::ContentSettingsTypeToGroupName(
base::Value("contentSettingCategoryChanged"), content_type)));
base::Value(
site_settings::ContentSettingsTypeToGroupName(content_type)));
} else { } else {
CallJavascriptFunction( FireWebUIListener(
"cr.webUIListenerCallback", "contentSettingSitePermissionChanged",
base::Value("contentSettingSitePermissionChanged"),
base::Value( base::Value(
site_settings::ContentSettingsTypeToGroupName(content_type)), site_settings::ContentSettingsTypeToGroupName(content_type)),
base::Value(primary_pattern.ToString()), base::Value(primary_pattern.ToString()),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment