| Index: chrome/browser/ui/webui/settings/search_engines_handler.cc
|
| diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome/browser/ui/webui/settings/search_engines_handler.cc
|
| index 077d940d7905736a8c5daf8dca586a1fc57e4e94..31be170b31927d5e1747ea1ef0aa7c6d0ae9e797 100644
|
| --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
|
| @@ -196,13 +196,11 @@ SearchEnginesHandler::GetSearchEnginesList() {
|
|
|
| void SearchEnginesHandler::OnModelChanged() {
|
| AllowJavascript();
|
| - CallJavascriptFunction("cr.webUIListenerCallback",
|
| - base::Value("search-engines-changed"),
|
| - *GetSearchEnginesList());
|
| + FireWebUIListener("search-engines-changed", *GetSearchEnginesList());
|
| +
|
| // Google Now availability may have changed.
|
| - CallJavascriptFunction("cr.webUIListenerCallback",
|
| - base::Value("google-now-availability-changed"),
|
| - base::Value(IsGoogleNowAvailable(profile_)));
|
| + FireWebUIListener("google-now-availability-changed",
|
| + base::Value(IsGoogleNowAvailable(profile_)));
|
| }
|
|
|
| void SearchEnginesHandler::OnItemsChanged(int start, int length) {
|
| @@ -514,12 +512,10 @@ void SearchEnginesHandler::OnGetHotwordAudioHistoryEnabled(
|
| void SearchEnginesHandler::HotwordInfoComplete(
|
| const base::Value* callback_id,
|
| const base::DictionaryValue& status) {
|
| - if (callback_id) {
|
| + if (callback_id)
|
| ResolveJavascriptCallback(*callback_id, status);
|
| - } else {
|
| - CallJavascriptFunction("cr.webUIListenerCallback",
|
| - base::Value("hotword-info-update"), status);
|
| - }
|
| + else
|
| + FireWebUIListener("hotword-info-update", status);
|
| }
|
|
|
| void SearchEnginesHandler::SendHotwordInfo() {
|
|
|