diff options
Diffstat (limited to 'content/renderer/render_view_impl.cc')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index b133a2c..21cd7f0 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -56,7 +56,9 @@ #include "content/public/renderer/navigation_state.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_visitor.h" +#include "content/renderer/browser_plugin/browser_plugin.h" #include "content/renderer/browser_plugin/browser_plugin_channel_manager.h" +#include "content/renderer/browser_plugin/browser_plugin_constants.h" #include "content/renderer/browser_plugin/guest_to_embedder_channel.h" #include "content/renderer/device_orientation_dispatcher.h" #include "content/renderer/devtools_agent.h" @@ -81,8 +83,6 @@ #include "content/renderer/notification_provider.h" #include "content/renderer/p2p/socket_dispatcher.h" #include "content/renderer/plugin_channel_host.h" -#include "content/renderer/browser_plugin/browser_plugin.h" -#include "content/renderer/browser_plugin/browser_plugin_constants.h" #include "content/renderer/render_process.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_widget_fullscreen_pepper.h" @@ -105,10 +105,10 @@ #include "net/base/net_errors.h" #include "net/http/http_util.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" @@ -161,7 +161,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/javascript_message_type.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" @@ -1555,7 +1554,7 @@ void RenderViewImpl::LoadNavigationErrorPage( replace); } -bool RenderViewImpl::RunJavaScriptMessage(ui::JavascriptMessageType type, +bool RenderViewImpl::RunJavaScriptMessage(content::JavaScriptMessageType type, const string16& message, const string16& default_value, const GURL& frame_url, @@ -1920,7 +1919,7 @@ bool RenderViewImpl::runFileChooser( void RenderViewImpl::runModalAlertDialog(WebFrame* frame, const WebString& message) { - RunJavaScriptMessage(ui::JAVASCRIPT_MESSAGE_TYPE_ALERT, + RunJavaScriptMessage(content::JAVASCRIPT_MESSAGE_TYPE_ALERT, message, string16(), frame->document().url(), @@ -1929,7 +1928,7 @@ void RenderViewImpl::runModalAlertDialog(WebFrame* frame, bool RenderViewImpl::runModalConfirmDialog(WebFrame* frame, const WebString& message) { - return RunJavaScriptMessage(ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM, + return RunJavaScriptMessage(content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM, message, string16(), frame->document().url(), @@ -1941,7 +1940,7 @@ bool RenderViewImpl::runModalPromptDialog(WebFrame* frame, const WebString& default_value, WebString* actual_value) { string16 result; - bool ok = RunJavaScriptMessage(ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT, + bool ok = RunJavaScriptMessage(content::JAVASCRIPT_MESSAGE_TYPE_PROMPT, message, default_value, frame->document().url(), |