Commit a86a61db authored by avi@chromium.org's avatar avi@chromium.org

Move modal dialogs from WebViewClient to WebFrameClient, part 3/3.

BUG=304341
TEST=modal dialogs still work

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263103 0039d316-1c4b-4281-b951-d872f2087c98
parent dcc29777
...@@ -1715,60 +1715,6 @@ bool RenderViewImpl::runFileChooser( ...@@ -1715,60 +1715,6 @@ bool RenderViewImpl::runFileChooser(
return ScheduleFileChooser(ipc_params, chooser_completion); return ScheduleFileChooser(ipc_params, chooser_completion);
} }
void RenderViewImpl::runModalAlertDialog(WebLocalFrame* frame,
const WebString& message) {
RenderFrameImpl::FromWebFrame(frame)->runModalAlertDialog(message);
}
bool RenderViewImpl::runModalConfirmDialog(WebLocalFrame* frame,
const WebString& message) {
return RenderFrameImpl::FromWebFrame(frame)->runModalConfirmDialog(message);
}
bool RenderViewImpl::runModalPromptDialog(WebLocalFrame* frame,
const WebString& message,
const WebString& default_value,
WebString* actual_value) {
return RenderFrameImpl::FromWebFrame(frame)->
runModalPromptDialog(message, default_value, actual_value);
}
bool RenderViewImpl::runModalBeforeUnloadDialog(WebLocalFrame* frame,
const WebString& message) {
bool is_reload = false;
WebDataSource* ds = frame->provisionalDataSource();
if (ds)
is_reload = (ds->navigationType() == blink::WebNavigationTypeReload);
return RenderFrameImpl::FromWebFrame(frame)->
runModalBeforeUnloadDialog(is_reload, message);
}
void RenderViewImpl::runModalAlertDialog(const WebString& message) {
/* bogus version of the function to avoid errors */
NOTIMPLEMENTED();
}
bool RenderViewImpl::runModalConfirmDialog(const WebString& message) {
/* bogus version of the function to avoid errors */
NOTIMPLEMENTED();
return false;
}
bool RenderViewImpl::runModalPromptDialog(const WebString& message,
const WebString& default_value,
WebString* actual_value) {
/* bogus version of the function to avoid errors */
NOTIMPLEMENTED();
return false;
}
bool RenderViewImpl::runModalBeforeUnloadDialog(bool is_reload,
const WebString& message) {
/* bogus version of the function to avoid errors */
NOTIMPLEMENTED();
return false;
}
void RenderViewImpl::showValidationMessage( void RenderViewImpl::showValidationMessage(
const blink::WebRect& anchor_in_root_view, const blink::WebRect& anchor_in_root_view,
const blink::WebString& main_text, const blink::WebString& main_text,
......
...@@ -440,25 +440,6 @@ class CONTENT_EXPORT RenderViewImpl ...@@ -440,25 +440,6 @@ class CONTENT_EXPORT RenderViewImpl
virtual bool runFileChooser( virtual bool runFileChooser(
const blink::WebFileChooserParams& params, const blink::WebFileChooserParams& params,
blink::WebFileChooserCompletion* chooser_completion); blink::WebFileChooserCompletion* chooser_completion);
virtual void runModalAlertDialog(blink::WebLocalFrame* frame,
const blink::WebString& message);
virtual bool runModalConfirmDialog(blink::WebLocalFrame* frame,
const blink::WebString& message);
virtual bool runModalPromptDialog(blink::WebLocalFrame* frame,
const blink::WebString& message,
const blink::WebString& default_value,
blink::WebString* actual_value);
virtual bool runModalBeforeUnloadDialog(blink::WebLocalFrame* frame,
const blink::WebString& message);
// -- begin stub implementations --
virtual void runModalAlertDialog(const blink::WebString& message);
virtual bool runModalConfirmDialog(const blink::WebString& message);
virtual bool runModalPromptDialog(const blink::WebString& message,
const blink::WebString& default_value,
blink::WebString* actual_value);
virtual bool runModalBeforeUnloadDialog(bool is_reload,
const blink::WebString& message);
// -- end stub implementations --
virtual void showValidationMessage(const blink::WebRect& anchor_in_root_view, virtual void showValidationMessage(const blink::WebRect& anchor_in_root_view,
const blink::WebString& main_text, const blink::WebString& main_text,
const blink::WebString& sub_text, const blink::WebString& sub_text,
......
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