Index: content/common/view_messages.h |
diff --git a/content/common/view_messages.h b/content/common/view_messages.h |
index 57966c3bee8f8dc5db47c412e6931f37578d3f00..0c414c6c1f540ce9f5b6eed0b904a8b6d7ef5d05 100644 |
--- a/content/common/view_messages.h |
+++ b/content/common/view_messages.h |
@@ -16,6 +16,7 @@ |
#include "content/public/common/context_menu_params.h" |
#include "content/public/common/file_chooser_params.h" |
#include "content/public/common/frame_navigate_params.h" |
+#include "content/public/common/javascript_message_type.h" |
#include "content/public/common/page_zoom.h" |
#include "content/public/common/referrer.h" |
#include "content/public/common/renderer_preferences.h" |
@@ -30,14 +31,13 @@ |
#include "media/base/media_log_event.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginAction.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
#include "ui/base/ime/text_input_type.h" |
-#include "ui/base/javascript_message_type.h" |
#include "ui/base/range/range.h" |
#include "ui/gfx/point.h" |
#include "ui/gfx/rect.h" |
@@ -67,13 +67,13 @@ IPC_ENUM_TRAITS(WebKit::WebTextDirection) |
IPC_ENUM_TRAITS(WebMenuItem::Type) |
IPC_ENUM_TRAITS(WindowContainerType) |
IPC_ENUM_TRAITS(content::FileChooserParams::Mode) |
+IPC_ENUM_TRAITS(content::JavaScriptMessageType) |
IPC_ENUM_TRAITS(content::PageZoom) |
IPC_ENUM_TRAITS(content::RendererPreferencesHintingEnum) |
IPC_ENUM_TRAITS(content::RendererPreferencesSubpixelRenderingEnum) |
IPC_ENUM_TRAITS(content::StopFindAction) |
IPC_ENUM_TRAITS(media::MediaLogEvent::Type) |
IPC_ENUM_TRAITS(ui::TextInputType) |
-IPC_ENUM_TRAITS(ui::JavascriptMessageType) |
IPC_STRUCT_TRAITS_BEGIN(EditCommand) |
IPC_STRUCT_TRAITS_MEMBER(name) |
@@ -1673,7 +1673,7 @@ IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage, |
string16 /* in - alert message */, |
string16 /* in - default prompt */, |
GURL /* in - originating page URL */, |
- ui::JavascriptMessageType /* in - type */, |
+ content::JavaScriptMessageType /* in - type */, |
bool /* out - success */, |
string16 /* out - user_input field */) |