Commit 81ad1796 authored by dbeam@chromium.org's avatar dbeam@chromium.org

webui: rename "DialogClose" to "dialogClose" to match other webui messages.

R=thakis@chromium.org
BUG=none
TEST=no DCHECK()s about unhandled webui messages fire

Review URL: https://codereview.chromium.org/251623003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266246 0039d316-1c4b-4281-b951-d872f2087c98
parent 1f16245c
...@@ -8,7 +8,7 @@ var FakeBluetoothOverlayParent = options.FakeBluetoothOverlayParent; ...@@ -8,7 +8,7 @@ var FakeBluetoothOverlayParent = options.FakeBluetoothOverlayParent;
/** @override */ /** @override */
OptionsPage.closeOverlay = function() { OptionsPage.closeOverlay = function() {
chrome.send('DialogClose'); chrome.send('dialogClose');
}; };
/** /**
......
...@@ -312,7 +312,7 @@ cr.define('chargerReplacement', function() { ...@@ -312,7 +312,7 @@ cr.define('chargerReplacement', function() {
}; };
$('finish-safe-charger').onclick = function() { $('finish-safe-charger').onclick = function() {
chrome.send('confirmSafeCharger'); chrome.send('confirmSafeCharger');
chrome.send('DialogClose'); chrome.send('dialogClose');
}; };
$('not-order-charger-checkbox-strip').style.visibility = 'hidden'; $('not-order-charger-checkbox-strip').style.visibility = 'hidden';
$('back-to-check-charger-from-charger-update').onclick = function() { $('back-to-check-charger-from-charger-update').onclick = function() {
...@@ -332,22 +332,22 @@ cr.define('chargerReplacement', function() { ...@@ -332,22 +332,22 @@ cr.define('chargerReplacement', function() {
}; };
$('finish-not-order-new-charger').onclick = function() { $('finish-not-order-new-charger').onclick = function() {
chrome.send('confirmNotOrderNewCharger'); chrome.send('confirmNotOrderNewCharger');
chrome.send('DialogClose'); chrome.send('dialogClose');
}; };
$('finish-online-order').onclick = function() { $('finish-online-order').onclick = function() {
chrome.send('confirmChargerOrderedOnline'); chrome.send('confirmChargerOrderedOnline');
chrome.send('DialogClose'); chrome.send('dialogClose');
}; };
$('offline-order-confirm').onclick = function() { $('offline-order-confirm').onclick = function() {
$('finish-offline-order').disabled = !$('offline-order-confirm').checked; $('finish-offline-order').disabled = !$('offline-order-confirm').checked;
}; };
$('finish-offline-order').onclick = function() { $('finish-offline-order').onclick = function() {
chrome.send('confirmChargerOrderByPhone'); chrome.send('confirmChargerOrderByPhone');
chrome.send('DialogClose'); chrome.send('dialogClose');
}; };
$('finish-still-bad-charger').onclick = function() { $('finish-still-bad-charger').onclick = function() {
chrome.send('confirmStillUseBadCharger'); chrome.send('confirmStillUseBadCharger');
chrome.send('DialogClose'); chrome.send('dialogClose');
}; };
var links = document.getElementsByClassName('link'); var links = document.getElementsByClassName('link');
......
...@@ -716,7 +716,7 @@ function initKeyboardOverlayId(inputMethodId) { ...@@ -716,7 +716,7 @@ function initKeyboardOverlayId(inputMethodId) {
*/ */
function learnMoreClicked(e) { function learnMoreClicked(e) {
chrome.send('openLearnMorePage'); chrome.send('openLearnMorePage');
chrome.send('DialogClose'); chrome.send('dialogClose');
e.preventDefault(); e.preventDefault();
} }
......
...@@ -63,7 +63,7 @@ cr.define('inline.login', function() { ...@@ -63,7 +63,7 @@ cr.define('inline.login', function() {
* Closes the inline login dialog. * Closes the inline login dialog.
*/ */
function closeDialog() { function closeDialog() {
chrome.send('DialogClose', ['']); chrome.send('dialogClose', ['']);
} }
/** /**
......
...@@ -339,7 +339,7 @@ cr.define('print_preview', function() { ...@@ -339,7 +339,7 @@ cr.define('print_preview', function() {
/** Closes the print preview dialog. */ /** Closes the print preview dialog. */
startCloseDialog: function() { startCloseDialog: function() {
chrome.send('closePrintPreviewDialog'); chrome.send('closePrintPreviewDialog');
chrome.send('DialogClose'); chrome.send('dialogClose');
}, },
/** Hide the print preview dialog and allow the native layer to close it. */ /** Hide the print preview dialog and allow the native layer to close it. */
......
...@@ -67,8 +67,8 @@ void ConstrainedWebDialogUI::RenderViewCreated( ...@@ -67,8 +67,8 @@ void ConstrainedWebDialogUI::RenderViewCreated(
web_ui()->AddMessageHandler(*it); web_ui()->AddMessageHandler(*it);
} }
// Add a "DialogClose" callback which matches WebDialogUI behavior. // Add a "dialogClose" callback which matches WebDialogUI behavior.
web_ui()->RegisterMessageCallback("DialogClose", web_ui()->RegisterMessageCallback("dialogClose",
base::Bind(&ConstrainedWebDialogUI::OnDialogCloseMessage, base::Bind(&ConstrainedWebDialogUI::OnDialogCloseMessage,
base::Unretained(this))); base::Unretained(this)));
......
...@@ -26,7 +26,7 @@ class ConstrainedWebDialogDelegate { ...@@ -26,7 +26,7 @@ class ConstrainedWebDialogDelegate {
virtual const ui::WebDialogDelegate* GetWebDialogDelegate() const = 0; virtual const ui::WebDialogDelegate* GetWebDialogDelegate() const = 0;
virtual ui::WebDialogDelegate* GetWebDialogDelegate() = 0; virtual ui::WebDialogDelegate* GetWebDialogDelegate() = 0;
// Called when the dialog is being closed in response to a "DialogClose" // Called when the dialog is being closed in response to a "dialogClose"
// message from WebUI. // message from WebUI.
virtual void OnDialogCloseFromWebUI() = 0; virtual void OnDialogCloseFromWebUI() = 0;
......
...@@ -138,11 +138,11 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView, ...@@ -138,11 +138,11 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
// beforeunload event. // beforeunload event.
bool before_unload_fired_; bool before_unload_fired_;
// Whether the dialog is closed from WebUI in response to a "DialogClose" // Whether the dialog is closed from WebUI in response to a "dialogClose"
// message. // message.
bool closed_via_webui_; bool closed_via_webui_;
// A json string returned to WebUI from a "DialogClosed" message. // A json string returned to WebUI from a "dialogClose" message.
std::string dialog_close_retval_; std::string dialog_close_retval_;
// Whether CloseContents() has been called. // Whether CloseContents() has been called.
......
...@@ -86,7 +86,7 @@ class WEB_DIALOGS_EXPORT WebDialogDelegate { ...@@ -86,7 +86,7 @@ class WEB_DIALOGS_EXPORT WebDialogDelegate {
virtual void OnDialogClosed(const std::string& json_retval) = 0; virtual void OnDialogClosed(const std::string& json_retval) = 0;
// A callback to notify the delegate that the dialog is being closed in // A callback to notify the delegate that the dialog is being closed in
// response to a "DialogClose" message from WebUI. // response to a "dialogClose" message from WebUI.
virtual void OnDialogCloseFromWebUI(const std::string& json_retval); virtual void OnDialogCloseFromWebUI(const std::string& json_retval);
// A callback to notify the delegate that the contents have gone // A callback to notify the delegate that the contents have gone
......
...@@ -79,7 +79,7 @@ WebDialogDelegate* WebDialogUI::GetDelegate( ...@@ -79,7 +79,7 @@ WebDialogDelegate* WebDialogUI::GetDelegate(
void WebDialogUI::RenderViewCreated(RenderViewHost* render_view_host) { void WebDialogUI::RenderViewCreated(RenderViewHost* render_view_host) {
// Hook up the javascript function calls, also known as chrome.send("foo") // Hook up the javascript function calls, also known as chrome.send("foo")
// calls in the HTML, to the actual C++ functions. // calls in the HTML, to the actual C++ functions.
web_ui()->RegisterMessageCallback("DialogClose", web_ui()->RegisterMessageCallback("dialogClose",
base::Bind(&WebDialogUI::OnDialogClosed, base::Unretained(this))); base::Bind(&WebDialogUI::OnDialogClosed, base::Unretained(this)));
// Pass the arguments to the renderer supplied by the delegate. // Pass the arguments to the renderer supplied by the delegate.
......
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