Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git] / src / content / common / view_messages.h
index c242de2..8a2d3dd 100644 (file)
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
-#include "content/common/browser_rendering_stats.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/common/cookie_data.h"
+#include "content/common/input/did_overscroll_params.h"
+#include "content/common/input/input_event_ack_state.h"
 #include "content/common/navigation_gesture.h"
 #include "content/common/pepper_renderer_instance_data.h"
 #include "content/common/view_message_enums.h"
 #include "content/common/webplugin_geometry.h"
-#include "content/port/common/input_event_ack_state.h"
 #include "content/public/common/common_param_traits.h"
-#include "content/public/common/context_menu_params.h"
 #include "content/public/common/favicon_url.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/menu_item.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/page_zoom.h"
@@ -34,6 +31,7 @@
 #include "content/public/common/stop_find_action.h"
 #include "content/public/common/three_d_api_types.h"
 #include "content/public/common/window_container_type.h"
+#include "content/common/date_time_suggestion.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/base/media_log_event.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
-#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
+#include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerAction.h"
 #include "third_party/WebKit/public/web/WebPluginAction.h"
 #include "third_party/WebKit/public/web/WebPopupType.h"
-#include "third_party/WebKit/public/web/WebScreenInfo.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ime/text_input_mode.h"
@@ -63,6 +60,7 @@
 
 #if defined(OS_MACOSX)
 #include "content/common/mac/font_descriptor.h"
+#include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h"
 #endif
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_START ViewMsgStart
 
 IPC_ENUM_TRAITS(AccessibilityMode)
-IPC_ENUM_TRAITS(ViewMsg_Navigate_Type::Value)
-IPC_ENUM_TRAITS(WebKit::WebContextMenuData::MediaType)
-IPC_ENUM_TRAITS(WebKit::WebMediaPlayerAction::Type)
-IPC_ENUM_TRAITS(WebKit::WebPluginAction::Type)
-IPC_ENUM_TRAITS(WebKit::WebPopupType)
-IPC_ENUM_TRAITS(WebKit::WebTextDirection)
+IPC_ENUM_TRAITS(blink::WebMediaPlayerAction::Type)
+IPC_ENUM_TRAITS(blink::WebPluginAction::Type)
+IPC_ENUM_TRAITS(blink::WebPopupType)
+IPC_ENUM_TRAITS(blink::WebTextDirection)
 IPC_ENUM_TRAITS(WindowContainerType)
 IPC_ENUM_TRAITS(content::FaviconURL::IconType)
 IPC_ENUM_TRAITS(content::FileChooserParams::Mode)
-IPC_ENUM_TRAITS(content::JavaScriptMessageType)
 IPC_ENUM_TRAITS(content::MenuItem::Type)
 IPC_ENUM_TRAITS(content::NavigationGesture)
 IPC_ENUM_TRAITS(content::PageZoom)
@@ -92,7 +87,6 @@ IPC_ENUM_TRAITS(content::StopFindAction)
 IPC_ENUM_TRAITS(content::ThreeDAPIType)
 IPC_ENUM_TRAITS(media::ChannelLayout)
 IPC_ENUM_TRAITS(media::MediaLogEvent::Type)
-IPC_ENUM_TRAITS(ui::MenuSourceType)
 IPC_ENUM_TRAITS_MAX_VALUE(ui::TextInputMode, ui::TEXT_INPUT_MODE_MAX)
 IPC_ENUM_TRAITS(ui::TextInputType)
 
@@ -103,48 +97,43 @@ IPC_STRUCT_TRAITS_BEGIN(FontDescriptor)
 IPC_STRUCT_TRAITS_END()
 #endif
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCompositionUnderline)
-  IPC_STRUCT_TRAITS_MEMBER(startOffset)
-  IPC_STRUCT_TRAITS_MEMBER(endOffset)
-  IPC_STRUCT_TRAITS_MEMBER(color)
-  IPC_STRUCT_TRAITS_MEMBER(thick)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebFindOptions)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebFindOptions)
   IPC_STRUCT_TRAITS_MEMBER(forward)
   IPC_STRUCT_TRAITS_MEMBER(matchCase)
   IPC_STRUCT_TRAITS_MEMBER(findNext)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebMediaPlayerAction)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebMediaPlayerAction)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(enable)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPluginAction)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebPluginAction)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(enable)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebFloatPoint)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebFloatPoint)
   IPC_STRUCT_TRAITS_MEMBER(x)
   IPC_STRUCT_TRAITS_MEMBER(y)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebFloatRect)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebFloatRect)
   IPC_STRUCT_TRAITS_MEMBER(x)
   IPC_STRUCT_TRAITS_MEMBER(y)
   IPC_STRUCT_TRAITS_MEMBER(width)
   IPC_STRUCT_TRAITS_MEMBER(height)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebScreenInfo)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebScreenInfo)
   IPC_STRUCT_TRAITS_MEMBER(deviceScaleFactor)
   IPC_STRUCT_TRAITS_MEMBER(depth)
   IPC_STRUCT_TRAITS_MEMBER(depthPerComponent)
   IPC_STRUCT_TRAITS_MEMBER(isMonochrome)
   IPC_STRUCT_TRAITS_MEMBER(rect)
   IPC_STRUCT_TRAITS_MEMBER(availableRect)
+  IPC_STRUCT_TRAITS_MEMBER(orientationType)
+  IPC_STRUCT_TRAITS_MEMBER(orientationAngle)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::MenuItem)
@@ -159,54 +148,22 @@ IPC_STRUCT_TRAITS_BEGIN(content::MenuItem)
   IPC_STRUCT_TRAITS_MEMBER(submenu)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(content::ContextMenuParams)
-  IPC_STRUCT_TRAITS_MEMBER(media_type)
-  IPC_STRUCT_TRAITS_MEMBER(x)
-  IPC_STRUCT_TRAITS_MEMBER(y)
-  IPC_STRUCT_TRAITS_MEMBER(link_url)
-  IPC_STRUCT_TRAITS_MEMBER(link_text)
-  IPC_STRUCT_TRAITS_MEMBER(unfiltered_link_url)
-  IPC_STRUCT_TRAITS_MEMBER(src_url)
-  IPC_STRUCT_TRAITS_MEMBER(has_image_contents)
-  IPC_STRUCT_TRAITS_MEMBER(page_url)
-  IPC_STRUCT_TRAITS_MEMBER(keyword_url)
-  IPC_STRUCT_TRAITS_MEMBER(frame_url)
-  IPC_STRUCT_TRAITS_MEMBER(frame_page_state)
-  IPC_STRUCT_TRAITS_MEMBER(media_flags)
-  IPC_STRUCT_TRAITS_MEMBER(selection_text)
-  IPC_STRUCT_TRAITS_MEMBER(misspelled_word)
-  IPC_STRUCT_TRAITS_MEMBER(misspelling_hash)
-  IPC_STRUCT_TRAITS_MEMBER(dictionary_suggestions)
-  IPC_STRUCT_TRAITS_MEMBER(speech_input_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(spellcheck_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(is_editable)
-#if defined(OS_MACOSX)
-  IPC_STRUCT_TRAITS_MEMBER(writing_direction_default)
-  IPC_STRUCT_TRAITS_MEMBER(writing_direction_left_to_right)
-  IPC_STRUCT_TRAITS_MEMBER(writing_direction_right_to_left)
-#endif  // OS_MACOSX
-  IPC_STRUCT_TRAITS_MEMBER(edit_flags)
-  IPC_STRUCT_TRAITS_MEMBER(security_info)
-  IPC_STRUCT_TRAITS_MEMBER(frame_charset)
-  IPC_STRUCT_TRAITS_MEMBER(referrer_policy)
-  IPC_STRUCT_TRAITS_MEMBER(custom_context)
-  IPC_STRUCT_TRAITS_MEMBER(custom_items)
-  IPC_STRUCT_TRAITS_MEMBER(source_type)
-#if defined(OS_ANDROID)
-  IPC_STRUCT_TRAITS_MEMBER(selection_start)
-  IPC_STRUCT_TRAITS_MEMBER(selection_end)
-#endif
+IPC_STRUCT_TRAITS_BEGIN(content::DateTimeSuggestion)
+  IPC_STRUCT_TRAITS_MEMBER(value)
+  IPC_STRUCT_TRAITS_MEMBER(localized_value)
+  IPC_STRUCT_TRAITS_MEMBER(label)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(content::CustomContextMenuContext)
-  IPC_STRUCT_TRAITS_MEMBER(is_pepper_menu)
-  IPC_STRUCT_TRAITS_MEMBER(request_id)
-  IPC_STRUCT_TRAITS_MEMBER(render_widget_id)
+IPC_STRUCT_TRAITS_BEGIN(content::DidOverscrollParams)
+  IPC_STRUCT_TRAITS_MEMBER(accumulated_overscroll)
+  IPC_STRUCT_TRAITS_MEMBER(latest_overscroll_delta)
+  IPC_STRUCT_TRAITS_MEMBER(current_fling_velocity)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::FaviconURL)
   IPC_STRUCT_TRAITS_MEMBER(icon_url)
   IPC_STRUCT_TRAITS_MEMBER(icon_type)
+  IPC_STRUCT_TRAITS_MEMBER(icon_sizes)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::FileChooserParams)
@@ -219,23 +176,9 @@ IPC_STRUCT_TRAITS_BEGIN(content::FileChooserParams)
 #endif
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(content::FrameNavigateParams)
-  IPC_STRUCT_TRAITS_MEMBER(page_id)
-  IPC_STRUCT_TRAITS_MEMBER(url)
-  IPC_STRUCT_TRAITS_MEMBER(base_url)
-  IPC_STRUCT_TRAITS_MEMBER(referrer)
-  IPC_STRUCT_TRAITS_MEMBER(transition)
-  IPC_STRUCT_TRAITS_MEMBER(redirects)
-  IPC_STRUCT_TRAITS_MEMBER(should_update_history)
-  IPC_STRUCT_TRAITS_MEMBER(searchable_form_url)
-  IPC_STRUCT_TRAITS_MEMBER(searchable_form_encoding)
-  IPC_STRUCT_TRAITS_MEMBER(contents_mime_type)
-  IPC_STRUCT_TRAITS_MEMBER(socket_address)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(content::PepperRendererInstanceData)
   IPC_STRUCT_TRAITS_MEMBER(render_process_id)
-  IPC_STRUCT_TRAITS_MEMBER(render_view_id)
+  IPC_STRUCT_TRAITS_MEMBER(render_frame_id)
   IPC_STRUCT_TRAITS_MEMBER(document_url)
   IPC_STRUCT_TRAITS_MEMBER(plugin_url)
 IPC_STRUCT_TRAITS_END()
@@ -271,6 +214,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
   IPC_STRUCT_TRAITS_MEMBER(tap_multiple_targets_strategy)
   IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
   IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
+  IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::CookieData)
@@ -306,17 +250,6 @@ IPC_STRUCT_TRAITS_BEGIN(ui::SelectedFileInfo)
   IPC_STRUCT_TRAITS_MEMBER(display_name)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(content::BrowserRenderingStats)
-  IPC_STRUCT_TRAITS_MEMBER(input_event_count)
-  IPC_STRUCT_TRAITS_MEMBER(total_input_latency)
-  IPC_STRUCT_TRAITS_MEMBER(touch_ui_count)
-  IPC_STRUCT_TRAITS_MEMBER(total_touch_ui_latency)
-  IPC_STRUCT_TRAITS_MEMBER(touch_acked_count)
-  IPC_STRUCT_TRAITS_MEMBER(total_touch_acked_latency)
-  IPC_STRUCT_TRAITS_MEMBER(scroll_update_count)
-  IPC_STRUCT_TRAITS_MEMBER(total_scroll_update_latency)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params)
   // Routing ID of the view initiating the open.
   IPC_STRUCT_MEMBER(int, opener_id)
@@ -332,10 +265,10 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params)
 
   // The name of the resulting frame that should be created (empty if none
   // has been specified).
-  IPC_STRUCT_MEMBER(string16, frame_name)
+  IPC_STRUCT_MEMBER(base::string16, frame_name)
 
-  // The frame identifier of the frame initiating the open.
-  IPC_STRUCT_MEMBER(int64, opener_frame_id)
+  // The routing id of the frame initiating the open.
+  IPC_STRUCT_MEMBER(int, opener_render_frame_id)
 
   // The URL of the frame initiating the open.
   IPC_STRUCT_MEMBER(GURL, opener_url)
@@ -362,7 +295,12 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params)
   IPC_STRUCT_MEMBER(content::Referrer, referrer)
 
   // The window features to use for the new view.
-  IPC_STRUCT_MEMBER(WebKit::WebWindowFeatures, features)
+  IPC_STRUCT_MEMBER(blink::WebWindowFeatures, features)
+
+  // The additional window features to use for the new view. We pass these
+  // separately from |features| above because we cannot serialize WebStrings
+  // over IPC.
+  IPC_STRUCT_MEMBER(std::vector<base::string16>, additional_features)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewHostMsg_CreateWorker_Params)
@@ -370,122 +308,35 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWorker_Params)
   IPC_STRUCT_MEMBER(GURL, url)
 
   // Name for a SharedWorker, otherwise empty string.
-  IPC_STRUCT_MEMBER(string16, name)
+  IPC_STRUCT_MEMBER(base::string16, name)
 
-  // The ID of the parent document (unique within parent renderer).
-  IPC_STRUCT_MEMBER(unsigned long long, document_id)
+  // Security policy used in the worker.
+  IPC_STRUCT_MEMBER(base::string16, content_security_policy)
 
-  // RenderView routing id used to send messages back to the parent.
-  IPC_STRUCT_MEMBER(int, render_view_route_id)
+  // Security policy type used in the worker.
+  IPC_STRUCT_MEMBER(blink::WebContentSecurityPolicyType, security_policy_type)
 
-  // The route ID to associate with the worker. If MSG_ROUTING_NONE is passed,
-  // a new unique ID is created and assigned to the worker.
-  IPC_STRUCT_MEMBER(int, route_id)
+  // The ID of the parent document (unique within parent renderer).
+  IPC_STRUCT_MEMBER(unsigned long long, document_id)
 
-  // The ID of the appcache the main shared worker script resource was loaded
-  // from, only valid for shared workers.
-  IPC_STRUCT_MEMBER(int64, script_resource_appcache_id)
+  // RenderFrame routing id used to send messages back to the parent.
+  IPC_STRUCT_MEMBER(int, render_frame_route_id)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewHostMsg_DateTimeDialogValue_Params)
-  IPC_STRUCT_MEMBER(int, dialog_type)
-  IPC_STRUCT_MEMBER(int, year)
-  IPC_STRUCT_MEMBER(int, month)
-  IPC_STRUCT_MEMBER(int, day)
-  IPC_STRUCT_MEMBER(int, hour)
-  IPC_STRUCT_MEMBER(int, minute)
-  IPC_STRUCT_MEMBER(int, second)
-  IPC_STRUCT_MEMBER(int, milli)
-  IPC_STRUCT_MEMBER(int, week)
+  IPC_STRUCT_MEMBER(ui::TextInputType, dialog_type)
+  IPC_STRUCT_MEMBER(double, dialog_value)
   IPC_STRUCT_MEMBER(double, minimum)
   IPC_STRUCT_MEMBER(double, maximum)
   IPC_STRUCT_MEMBER(double, step)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(ViewHostMsg_DidFailProvisionalLoadWithError_Params)
-  // The frame ID for the failure report.
-  IPC_STRUCT_MEMBER(int64, frame_id)
-  // The WebFrame's uniqueName().
-  IPC_STRUCT_MEMBER(string16, frame_unique_name)
-  // True if this is the top-most frame.
-  IPC_STRUCT_MEMBER(bool, is_main_frame)
-  // Error code as reported in the DidFailProvisionalLoad callback.
-  IPC_STRUCT_MEMBER(int, error_code)
-  // An error message generated from the error_code. This can be an empty
-  // string if we were unable to find a meaningful description.
-  IPC_STRUCT_MEMBER(string16, error_description)
-  // The URL that the error is reported for.
-  IPC_STRUCT_MEMBER(GURL, url)
-  // True if the failure is the result of navigating to a POST again
-  // and we're going to show the POST interstitial.
-  IPC_STRUCT_MEMBER(bool, showing_repost_interstitial)
-IPC_STRUCT_END()
-
-// Parameters structure for ViewHostMsg_FrameNavigate, which has too many data
-// parameters to be reasonably put in a predefined IPC message.
-IPC_STRUCT_BEGIN_WITH_PARENT(ViewHostMsg_FrameNavigate_Params,
-                             content::FrameNavigateParams)
-  IPC_STRUCT_TRAITS_PARENT(content::FrameNavigateParams)
-  // The frame ID for this navigation. The frame ID uniquely identifies the
-  // frame the navigation happened in for a given renderer.
-  IPC_STRUCT_MEMBER(int64, frame_id)
-
-  // The WebFrame's uniqueName().
-  IPC_STRUCT_MEMBER(string16, frame_unique_name)
-
-  // Information regarding the security of the connection (empty if the
-  // connection was not secure).
-  IPC_STRUCT_MEMBER(std::string, security_info)
-
-  // The gesture that initiated this navigation.
-  IPC_STRUCT_MEMBER(content::NavigationGesture, gesture)
-
-  // True if this was a post request.
-  IPC_STRUCT_MEMBER(bool, is_post)
-
-  // The POST body identifier. -1 if it doesn't exist.
-  IPC_STRUCT_MEMBER(int64, post_id)
-
-  // Whether the frame navigation resulted in no change to the documents within
-  // the page. For example, the navigation may have just resulted in scrolling
-  // to a named anchor.
-  IPC_STRUCT_MEMBER(bool, was_within_same_page)
-
-  // The status code of the HTTP request.
-  IPC_STRUCT_MEMBER(int, http_status_code)
-
-  // True if the connection was proxied.  In this case, socket_address
-  // will represent the address of the proxy, rather than the remote host.
-  IPC_STRUCT_MEMBER(bool, was_fetched_via_proxy)
-
-  // Serialized history item state to store in the navigation entry.
-  IPC_STRUCT_MEMBER(content::PageState, page_state)
-
-  // Original request's URL.
-  IPC_STRUCT_MEMBER(GURL, original_request_url)
-
-  // User agent override used to navigate.
-  IPC_STRUCT_MEMBER(bool, is_overriding_user_agent)
-
-  // Notifies the browser that for this navigation, the session history was
-  // successfully cleared.
-  IPC_STRUCT_MEMBER(bool, history_list_was_cleared)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(ViewHostMsg_OpenURL_Params)
-  IPC_STRUCT_MEMBER(GURL, url)
-  IPC_STRUCT_MEMBER(content::Referrer, referrer)
-  IPC_STRUCT_MEMBER(WindowOpenDisposition, disposition)
-  IPC_STRUCT_MEMBER(int64, frame_id)
-  IPC_STRUCT_MEMBER(bool, should_replace_current_entry)
-  IPC_STRUCT_MEMBER(bool, user_gesture)
+  IPC_STRUCT_MEMBER(std::vector<content::DateTimeSuggestion>, suggestions)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewHostMsg_SelectionBounds_Params)
   IPC_STRUCT_MEMBER(gfx::Rect, anchor_rect)
-  IPC_STRUCT_MEMBER(WebKit::WebTextDirection, anchor_dir)
+  IPC_STRUCT_MEMBER(blink::WebTextDirection, anchor_dir)
   IPC_STRUCT_MEMBER(gfx::Rect, focus_rect)
-  IPC_STRUCT_MEMBER(WebKit::WebTextDirection, focus_dir)
+  IPC_STRUCT_MEMBER(blink::WebTextDirection, focus_dir)
   IPC_STRUCT_MEMBER(bool, is_anchor_first)
 IPC_STRUCT_END()
 
@@ -544,33 +395,14 @@ IPC_STRUCT_BEGIN(ViewHostMsg_TextInputState_Params)
   // TEXT_INPUT_TYPE_NONE).
   IPC_STRUCT_MEMBER(bool, show_ime_if_needed)
 
-  // Whether an acknowledgement is required for this update.
-  IPC_STRUCT_MEMBER(bool, require_ack)
+  // Whether this change is originated from non-IME (e.g. Javascript, Autofill).
+  IPC_STRUCT_MEMBER(bool, is_non_ime_change)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewHostMsg_UpdateRect_Params)
-  // The bitmap to be painted into the view at the locations specified by
-  // update_rects.
-  IPC_STRUCT_MEMBER(TransportDIB::Id, bitmap)
-
-  // The position and size of the bitmap.
-  IPC_STRUCT_MEMBER(gfx::Rect, bitmap_rect)
-
-  // The scroll delta.  Only one of the delta components can be non-zero, and if
-  // they are both zero, then it means there is no scrolling and the scroll_rect
-  // is ignored.
-  IPC_STRUCT_MEMBER(gfx::Vector2d, scroll_delta)
-
-  // The rectangular region to scroll.
-  IPC_STRUCT_MEMBER(gfx::Rect, scroll_rect)
-
   // The scroll offset of the render view.
   IPC_STRUCT_MEMBER(gfx::Vector2d, scroll_offset)
 
-  // The regions of the bitmap (in view coords) that contain updated pixels.
-  // In the case of scrolling, this includes the scroll damage rect.
-  IPC_STRUCT_MEMBER(std::vector<gfx::Rect>, copy_rects)
-
   // The size of the RenderView when this message was generated.  This is
   // included so the host knows how large the view is from the perspective of
   // the renderer process.  This is necessary in case a resize operation is in
@@ -587,9 +419,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_UpdateRect_Params)
   //   ViewHostMsg_UpdateRect_Flags::IS_RESIZE_ACK
   //     Indicates that this is a response to a ViewMsg_Resize message.
   //
-  //   ViewHostMsg_UpdateRect_Flags::IS_RESTORE_ACK
-  //     Indicates that this is a response to a ViewMsg_WasShown message.
-  //
   //   ViewHostMsg_UpdateRect_Flags::IS_REPAINT_ACK
   //     Indicates that this is a response to a ViewMsg_Repaint message.
   //
@@ -599,104 +428,9 @@ IPC_STRUCT_BEGIN(ViewHostMsg_UpdateRect_Params)
   // request messages.
   IPC_STRUCT_MEMBER(int, flags)
 
-  // Whether or not the renderer expects a ViewMsg_UpdateRect_ACK for this
-  // update. True for 2D painting, but false for accelerated compositing.
-  IPC_STRUCT_MEMBER(bool, needs_ack)
-
   // All the above coordinates are in DIP. This is the scale factor needed
   // to convert them to pixels.
   IPC_STRUCT_MEMBER(float, scale_factor)
-
-  // The latency information for the frame. Only valid when accelerated
-  // compositing is disabled.
-  IPC_STRUCT_MEMBER(ui::LatencyInfo, latency_info)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(ViewMsg_Navigate_Params)
-  // The page_id for this navigation, or -1 if it is a new navigation.  Back,
-  // Forward, and Reload navigations should have a valid page_id.  If the load
-  // succeeds, then this page_id will be reflected in the resultant
-  // ViewHostMsg_FrameNavigate message.
-  IPC_STRUCT_MEMBER(int32, page_id)
-
-  // If page_id is -1, then pending_history_list_offset will also be -1.
-  // Otherwise, it contains the offset into the history list corresponding to
-  // the current navigation.
-  IPC_STRUCT_MEMBER(int, pending_history_list_offset)
-
-  // Informs the RenderView of where its current page contents reside in
-  // session history and the total size of the session history list.
-  IPC_STRUCT_MEMBER(int, current_history_list_offset)
-  IPC_STRUCT_MEMBER(int, current_history_list_length)
-
-  // Informs the RenderView the session history should be cleared. In that
-  // case, the RenderView needs to notify the browser that the clearing was
-  // succesful when the navigation commits.
-  IPC_STRUCT_MEMBER(bool, should_clear_history_list)
-
-  // The URL to load.
-  IPC_STRUCT_MEMBER(GURL, url)
-
-  // Base URL for use in WebKit's SubstituteData.
-  // Is only used with data: URLs.
-  IPC_STRUCT_MEMBER(GURL, base_url_for_data_url)
-
-  // History URL for use in WebKit's SubstituteData.
-  // Is only used with data: URLs.
-  IPC_STRUCT_MEMBER(GURL, history_url_for_data_url)
-
-  // The URL to send in the "Referer" header field. Can be empty if there is
-  // no referrer.
-  IPC_STRUCT_MEMBER(content::Referrer, referrer)
-
-  // Any redirect URLs that occurred before |url|. Useful for cross-process
-  // navigations; defaults to empty.
-  IPC_STRUCT_MEMBER(std::vector<GURL>, redirects)
-
-  // The type of transition.
-  IPC_STRUCT_MEMBER(content::PageTransition, transition)
-
-  // Opaque history state (received by ViewHostMsg_UpdateState).
-  IPC_STRUCT_MEMBER(content::PageState, page_state)
-
-  // Type of navigation.
-  IPC_STRUCT_MEMBER(ViewMsg_Navigate_Type::Value, navigation_type)
-
-  // The time the request was created
-  IPC_STRUCT_MEMBER(base::Time, request_time)
-
-  // Extra headers (separated by \n) to send during the request.
-  IPC_STRUCT_MEMBER(std::string, extra_headers)
-
-  // The following two members identify a previous request that has been
-  // created before this navigation is being transferred to a new render view.
-  // This serves the purpose of recycling the old request.
-  // Unless this refers to a transferred navigation, these values are -1 and -1.
-  IPC_STRUCT_MEMBER(int, transferred_request_child_id)
-  IPC_STRUCT_MEMBER(int, transferred_request_request_id)
-
-  // Whether or not we should allow the url to download.
-  IPC_STRUCT_MEMBER(bool, allow_download)
-
-  // Whether or not the user agent override string should be used.
-  IPC_STRUCT_MEMBER(bool, is_overriding_user_agent)
-
-  // True if this was a post request.
-  IPC_STRUCT_MEMBER(bool, is_post)
-
-  // If is_post is true, holds the post_data information from browser. Empty
-  // otherwise.
-  IPC_STRUCT_MEMBER(std::vector<unsigned char>, browser_initiated_post_data)
-
-  // Whether or not this url should be allowed to access local file://
-  // resources.
-  IPC_STRUCT_MEMBER(bool, can_load_local_resources)
-
-  // If not empty, which frame to navigate.
-  IPC_STRUCT_MEMBER(std::string, frame_to_navigate)
-
-  // The navigationStart time to expose to JS for this navigation.
-  IPC_STRUCT_MEMBER(base::TimeTicks, browser_navigation_start)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewMsg_New_Params)
@@ -719,7 +453,7 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params)
   IPC_STRUCT_MEMBER(int64, session_storage_namespace_id)
 
   // The name of the frame associated with this view (or empty if none).
-  IPC_STRUCT_MEMBER(string16, frame_name)
+  IPC_STRUCT_MEMBER(base::string16, frame_name)
 
   // The route ID of the opener RenderView if we need to set one
   // (MSG_ROUTING_NONE otherwise).
@@ -731,26 +465,27 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params)
   // Whether the RenderView should initially be hidden.
   IPC_STRUCT_MEMBER(bool, hidden)
 
+  // Whether the RenderView will never be visible.
+  IPC_STRUCT_MEMBER(bool, never_visible)
+
+  // Whether the window associated with this view was created with an opener.
+  IPC_STRUCT_MEMBER(bool, window_was_created_with_opener)
+
   // The initial page ID to use for this view, which must be larger than any
   // existing navigation that might be loaded in the view.  Page IDs are unique
   // to a view and are only updated by the renderer after this initial value.
   IPC_STRUCT_MEMBER(int32, next_page_id)
 
   // The properties of the screen associated with the view.
-  IPC_STRUCT_MEMBER(WebKit::WebScreenInfo, screen_info)
+  IPC_STRUCT_MEMBER(blink::WebScreenInfo, screen_info)
 
   // The accessibility mode of the renderer.
   IPC_STRUCT_MEMBER(AccessibilityMode, accessibility_mode)
-
-  // Specifies whether partially swapping composited buffers is
-  // allowed for a renderer. Partial swaps will be used if they are both
-  // allowed and supported.
-  IPC_STRUCT_MEMBER(bool, allow_partial_swap)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewMsg_PostMessage_Params)
   // The serialized script value.
-  IPC_STRUCT_MEMBER(string16, data)
+  IPC_STRUCT_MEMBER(base::string16, data)
 
   // When sent to the browser, this is the routing ID of the source frame in
   // the source process.  The browser replaces it with the routing ID of the
@@ -758,10 +493,10 @@ IPC_STRUCT_BEGIN(ViewMsg_PostMessage_Params)
   IPC_STRUCT_MEMBER(int, source_routing_id)
 
   // The origin of the source frame.
-  IPC_STRUCT_MEMBER(string16, source_origin)
+  IPC_STRUCT_MEMBER(base::string16, source_origin)
 
   // The origin for the message's target.
-  IPC_STRUCT_MEMBER(string16, target_origin)
+  IPC_STRUCT_MEMBER(base::string16, target_origin)
 
   // Information about the MessagePorts this message contains.
   IPC_STRUCT_MEMBER(std::vector<int>, message_port_ids)
@@ -793,10 +528,6 @@ IPC_MESSAGE_ROUTED1(ViewMsg_LockMouse_ACK,
 // Tells the render side that the mouse has been unlocked.
 IPC_MESSAGE_ROUTED0(ViewMsg_MouseLockLost)
 
-// Screen was rotated. Dispatched to the onorientationchange javascript API.
-IPC_MESSAGE_ROUTED1(ViewMsg_OrientationChangeEvent,
-                    int /* orientation */)
-
 // Sent by the browser when the parameters for vsync alignment have changed.
 IPC_MESSAGE_ROUTED2(ViewMsg_UpdateVSyncParameters,
                     base::TimeTicks /* timebase */,
@@ -819,11 +550,6 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SetHistoryLengthAndPrune,
                     int, /* merge_history_length */
                     int32 /* minimum_page_id */)
 
-// Tells the renderer the browser's notion of its process ID.
-// Some subsystems, like LatencyInfo, require this to be known to the renderer.
-IPC_MESSAGE_CONTROL1(ViewMsg_SetRendererProcessID,
-                     base::ProcessId /* process_id */)
-
 // Tells the renderer to create a new view.
 // This message is slightly different, the view it takes (via
 // ViewMsg_New_Params) is the view to create, the message itself is sent as a
@@ -845,16 +571,17 @@ IPC_MESSAGE_ROUTED1(ViewMsg_UpdateWebPreferences,
                     WebPreferences)
 
 // Informs the renderer that the timezone has changed.
-IPC_MESSAGE_ROUTED0(ViewMsg_TimezoneChange)
+IPC_MESSAGE_CONTROL0(ViewMsg_TimezoneChange)
 
 // Tells the render view to close.
 IPC_MESSAGE_ROUTED0(ViewMsg_Close)
 
 IPC_STRUCT_BEGIN(ViewMsg_Resize_Params)
-  IPC_STRUCT_MEMBER(WebKit::WebScreenInfo, screen_info)
+  IPC_STRUCT_MEMBER(blink::WebScreenInfo, screen_info)
   IPC_STRUCT_MEMBER(gfx::Size, new_size)
   IPC_STRUCT_MEMBER(gfx::Size, physical_backing_size)
   IPC_STRUCT_MEMBER(float, overdraw_bottom_height)
+  IPC_STRUCT_MEMBER(gfx::Size, visible_viewport_size)
   IPC_STRUCT_MEMBER(gfx::Rect, resizer_rect)
   IPC_STRUCT_MEMBER(bool, is_fullscreen)
 IPC_STRUCT_END()
@@ -877,9 +604,8 @@ IPC_MESSAGE_ROUTED0(ViewMsg_WasHidden)
 
 // Tells the render view that it is no longer hidden (see WasHidden), and the
 // render view is expected to respond with a full repaint if needs_repainting
-// is true.  In that case, the generated ViewHostMsg_UpdateRect message will
-// have the IS_RESTORE_ACK flag set.  If needs_repainting is false, then this
-// message does not trigger a message in response.
+// is true. If needs_repainting is false, then this message does not trigger a
+// message in response.
 IPC_MESSAGE_ROUTED1(ViewMsg_WasShown,
                     bool /* needs_repainting */)
 
@@ -887,83 +613,32 @@ IPC_MESSAGE_ROUTED1(ViewMsg_WasShown,
 // exit if no other views are using it.
 IPC_MESSAGE_ROUTED0(ViewMsg_WasSwappedOut)
 
-// Sent to render the view into the supplied transport DIB, resize
-// the web widget to match the |page_size|, scale it by the
-// appropriate scale to make it fit the |desired_size|, and return
-// it.  In response to this message, the host generates a
-// ViewHostMsg_PaintAtSize_ACK message.  Note that the DIB *must* be
-// the right size to receive an RGBA image at the |desired_size|.
-// |tag| is sent along with ViewHostMsg_PaintAtSize_ACK unmodified to
-// identify the PaintAtSize message the ACK belongs to.
-IPC_MESSAGE_ROUTED4(ViewMsg_PaintAtSize,
-                    TransportDIB::Handle /* dib_handle */,
-                    int /* tag */,
-                    gfx::Size /* page_size */,
-                    gfx::Size /* desired_size */)
-
-// Tells the render view that a ViewHostMsg_UpdateRect message was processed.
-// This signals the render view that it can send another UpdateRect message.
-IPC_MESSAGE_ROUTED0(ViewMsg_UpdateRect_ACK)
-
-// Tells the render view that a SwapBuffers was completed. Typically,
-// SwapBuffers requests go from renderer -> GPU process -> browser. Most
-// platforms still use the GfxCxt3D Echo for receiving the SwapBuffers Ack.
-// Using Echo routes the ack from browser -> GPU process -> renderer, while this
-// Ack goes directly from browser -> renderer. This is not used for the threaded
-// compositor path.
-IPC_MESSAGE_ROUTED0(ViewMsg_SwapBuffers_ACK)
-
-// Tells the render widget that a smooth scroll completed.
-IPC_MESSAGE_ROUTED0(ViewMsg_SyntheticGestureCompleted)
-
 // Tells the renderer to focus the first (last if reverse is true) focusable
 // node.
 IPC_MESSAGE_ROUTED1(ViewMsg_SetInitialFocus,
                     bool /* reverse */)
 
-// Executes custom context menu action that was provided from WebKit.
-IPC_MESSAGE_ROUTED2(ViewMsg_CustomContextMenuAction,
-                    content::CustomContextMenuContext /* custom_context */,
-                    unsigned /* action */)
-
-// Sent in response to a ViewHostMsg_ContextMenu to let the renderer know that
-// the menu has been closed.
-IPC_MESSAGE_ROUTED1(ViewMsg_ContextMenuClosed,
-                    content::CustomContextMenuContext /* custom_context */)
-
 // Sent to inform the renderer to invoke a context menu.
 // The parameter specifies the location in the render view's coordinates.
 IPC_MESSAGE_ROUTED1(ViewMsg_ShowContextMenu,
                     gfx::Point /* location where menu should be shown */)
 
-// Tells the renderer to perform the specified navigation, interrupting any
-// existing navigation.
-IPC_MESSAGE_ROUTED1(ViewMsg_Navigate, ViewMsg_Navigate_Params)
-
 IPC_MESSAGE_ROUTED0(ViewMsg_Stop)
 
-// Tells the renderer to reload the current focused frame
-IPC_MESSAGE_ROUTED0(ViewMsg_ReloadFrame)
-
 // Sent when the user wants to search for a word on the page (find in page).
 IPC_MESSAGE_ROUTED3(ViewMsg_Find,
                     int /* request_id */,
-                    string16 /* search_text */,
-                    WebKit::WebFindOptions)
+                    base::string16 /* search_text */,
+                    blink::WebFindOptions)
 
 // This message notifies the renderer that the user has closed the FindInPage
 // window (and what action to take regarding the selection).
 IPC_MESSAGE_ROUTED1(ViewMsg_StopFinding,
                     content::StopFindAction /* action */)
 
-// Informs the renderer about various statistics the browser has (e.g.
-// latency) regarding the frames that have been displayed.
-IPC_MESSAGE_ROUTED1(ViewMsg_SetBrowserRenderingStats,
-                    content::BrowserRenderingStats /* stats */)
-
 // Replaces a date time input field.
 IPC_MESSAGE_ROUTED1(ViewMsg_ReplaceDateTime,
-                    ViewHostMsg_DateTimeDialogValue_Params /* value */)
+                    double /* dialog_value */)
 
 // Copies the image at location x, y to the clipboard (if there indeed is an
 // image at that location).
@@ -971,46 +646,23 @@ IPC_MESSAGE_ROUTED2(ViewMsg_CopyImageAt,
                     int /* x */,
                     int /* y */)
 
+// Saves the image at location x, y to the disk (if there indeed is an
+// image at that location).
+IPC_MESSAGE_ROUTED2(ViewMsg_SaveImageAt,
+                    int /* x */,
+                    int /* y */)
+
 // Tells the renderer to perform the given action on the media player
 // located at the given point.
 IPC_MESSAGE_ROUTED2(ViewMsg_MediaPlayerActionAt,
                     gfx::Point, /* location */
-                    WebKit::WebMediaPlayerAction)
+                    blink::WebMediaPlayerAction)
 
 // Tells the renderer to perform the given action on the plugin located at
 // the given point.
 IPC_MESSAGE_ROUTED2(ViewMsg_PluginActionAt,
                     gfx::Point, /* location */
-                    WebKit::WebPluginAction)
-
-// Request for the renderer to evaluate an xpath to a frame and execute a
-// javascript: url in that frame's context. The message is completely
-// asynchronous and no corresponding response message is sent back.
-//
-// frame_xpath contains the modified xpath notation to identify an inner
-// subframe (starting from the root frame). It is a concatenation of
-// number of smaller xpaths delimited by '\n'. Each chunk in the string can
-// be evaluated to a frame in its parent-frame's context.
-//
-// Example: /html/body/iframe/\n/html/body/div/iframe/\n/frameset/frame[0]
-// can be broken into 3 xpaths
-// /html/body/iframe evaluates to an iframe within the root frame
-// /html/body/div/iframe evaluates to an iframe within the level-1 iframe
-// /frameset/frame[0] evaluates to first frame within the level-2 iframe
-//
-// jscript_url is the string containing the javascript: url to be executed
-// in the target frame's context. The string should start with "javascript:"
-// and continue with a valid JS text.
-//
-// If the fourth parameter is true the result is sent back to the renderer
-// using the message ViewHostMsg_ScriptEvalResponse.
-// ViewHostMsg_ScriptEvalResponse is passed the ID parameter so that the
-// client can uniquely identify the request.
-IPC_MESSAGE_ROUTED4(ViewMsg_ScriptEvalRequest,
-                    string16,  /* frame_xpath */
-                    string16,  /* jscript_url */
-                    int,  /* ID */
-                    bool  /* If true, result is sent back. */)
+                    blink::WebPluginAction)
 
 // Posts a message from a frame in another process to the current renderer.
 IPC_MESSAGE_ROUTED1(ViewMsg_PostMessageEvent,
@@ -1019,13 +671,6 @@ IPC_MESSAGE_ROUTED1(ViewMsg_PostMessageEvent,
 // Requests that the RenderView's main frame sets its opener to null.
 IPC_MESSAGE_ROUTED0(ViewMsg_DisownOpener)
 
-// Request for the renderer to evaluate an xpath to a frame and insert css
-// into that frame's document. See ViewMsg_ScriptEvalRequest for details on
-// allowed xpath expressions.
-IPC_MESSAGE_ROUTED2(ViewMsg_CSSInsertRequest,
-                    string16,  /* frame_xpath */
-                    std::string  /* css string */)
-
 // Change the zoom level for the current main frame.  If the level actually
 // changes, a ViewHostMsg_DidZoomURL message will be sent back to the browser
 // telling it what url got zoomed and what its current zoom level is.
@@ -1038,12 +683,6 @@ IPC_MESSAGE_ROUTED1(ViewMsg_Zoom,
 IPC_MESSAGE_ROUTED1(ViewMsg_SetZoomLevel,
                     double /* zoom_level */)
 
-// Zooms the page by the factor defined in the renderer.
-IPC_MESSAGE_ROUTED3(ViewMsg_ZoomFactor,
-                    content::PageZoom,
-                    int /* zoom center_x */,
-                    int /* zoom center_y */)
-
 // Set the zoom level for a particular url that the renderer is in the
 // process of loading.  This will be stored, to be used if the load commits
 // and ignored otherwise.
@@ -1092,54 +731,29 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SetWebUIProperty,
 IPC_MESSAGE_ROUTED1(ViewMsg_SetInputMethodActive,
                     bool /* is_active */)
 
+// IME API oncandidatewindow* events for InputMethodContext.
+IPC_MESSAGE_ROUTED0(ViewMsg_CandidateWindowShown)
+IPC_MESSAGE_ROUTED0(ViewMsg_CandidateWindowUpdated)
+IPC_MESSAGE_ROUTED0(ViewMsg_CandidateWindowHidden)
+
 // This message sends a string being composed with an input method.
 IPC_MESSAGE_ROUTED4(
     ViewMsg_ImeSetComposition,
-    string16, /* text */
-    std::vector<WebKit::WebCompositionUnderline>, /* underlines */
+    base::string16, /* text */
+    std::vector<blink::WebCompositionUnderline>, /* underlines */
     int, /* selectiont_start */
     int /* selection_end */)
 
 // This message confirms an ongoing composition.
 IPC_MESSAGE_ROUTED3(ViewMsg_ImeConfirmComposition,
-                    string16 /* text */,
+                    base::string16 /* text */,
                     gfx::Range /* replacement_range */,
                     bool /* keep_selection */)
 
-// Sets the text composition to be between the given start and end offsets
-// in the currently focused editable field.
-IPC_MESSAGE_ROUTED3(ViewMsg_SetCompositionFromExistingText,
-    int /* start */,
-    int /* end */,
-    std::vector<WebKit::WebCompositionUnderline> /* underlines */)
-
-// Selects between the given start and end offsets in the currently focused
-// editable field.
-IPC_MESSAGE_ROUTED2(ViewMsg_SetEditableSelectionOffsets,
-                    int /* start */,
-                    int /* end */)
-
-// Deletes the current selection plus the specified number of characters before
-// and after the selection or caret.
-IPC_MESSAGE_ROUTED2(ViewMsg_ExtendSelectionAndDelete,
-                    int /* before */,
-                    int /* after */)
-
 // Used to notify the render-view that we have received a target URL. Used
 // to prevent target URLs spamming the browser.
 IPC_MESSAGE_ROUTED0(ViewMsg_UpdateTargetURL_ACK)
 
-
-// Sets the alternate error page URL (link doctor) for the renderer process.
-IPC_MESSAGE_ROUTED1(ViewMsg_SetAltErrorPageURL,
-                    GURL)
-
-// Notifies the color chooser client that the user selected a color.
-IPC_MESSAGE_ROUTED2(ViewMsg_DidChooseColorResponse, unsigned, SkColor)
-
-// Notifies the color chooser client that the color chooser has ended.
-IPC_MESSAGE_ROUTED1(ViewMsg_DidEndColorChooser, unsigned)
-
 IPC_MESSAGE_ROUTED1(ViewMsg_RunFileChooserResponse,
                     std::vector<ui::SelectedFileInfo>)
 
@@ -1153,15 +767,10 @@ IPC_MESSAGE_ROUTED2(ViewMsg_EnumerateDirectoryResponse,
 // the renderer.
 IPC_MESSAGE_ROUTED0(ViewMsg_CantFocus)
 
-// Instructs the renderer to invoke the frame's shouldClose method, which
-// runs the onbeforeunload event handler.  Expects the result to be returned
-// via ViewHostMsg_ShouldClose.
-IPC_MESSAGE_ROUTED0(ViewMsg_ShouldClose)
-
-// Instructs the renderer to swap out for a cross-site transition, including
-// running the unload event handler. Expects a SwapOut_ACK message when
-// finished.
-IPC_MESSAGE_ROUTED0(ViewMsg_SwapOut)
+// Tells the renderer to suppress any further modal dialogs until it receives a
+// corresponding ViewMsg_SwapOut message.  This ensures that no
+// PageGroupLoadDeferrer is on the stack for SwapOut.
+IPC_MESSAGE_ROUTED0(ViewMsg_SuppressDialogsUntilSwapOut)
 
 // Instructs the renderer to close the current page, including running the
 // onunload event handler.
@@ -1207,10 +816,10 @@ IPC_MESSAGE_ROUTED1(ViewMsg_DisableAutoResize,
 
 // Changes the text direction of the currently selected input field (if any).
 IPC_MESSAGE_ROUTED1(ViewMsg_SetTextDirection,
-                    WebKit::WebTextDirection /* direction */)
+                    blink::WebTextDirection /* direction */)
 
-// Tells the renderer to clear the focused node (if any).
-IPC_MESSAGE_ROUTED0(ViewMsg_ClearFocusedNode)
+// Tells the renderer to clear the focused element (if any).
+IPC_MESSAGE_ROUTED0(ViewMsg_ClearFocusedElement)
 
 // Make the RenderView transparent and render it onto a custom background. The
 // background will be tiled in both directions if it is not large enough.
@@ -1227,14 +836,20 @@ IPC_MESSAGE_ROUTED1(ViewMsg_DisableScrollbarsForSmallWindows,
 IPC_MESSAGE_ROUTED1(ViewMsg_SetActive,
                     bool /* active */)
 
-// Response message to ViewHostMsg_CreateShared/DedicatedWorker.
+// Response message to ViewHostMsg_CreateWorker.
 // Sent when the worker has started.
 IPC_MESSAGE_ROUTED0(ViewMsg_WorkerCreated)
 
-// The response to ViewHostMsg_AsyncOpenPepperFile.
-IPC_MESSAGE_ROUTED2(ViewMsg_AsyncOpenPepperFile_ACK,
-                    base::PlatformFileError /* error_code */,
-                    IPC::PlatformFileForTransit /* file descriptor */)
+// Sent when the worker failed to load the worker script.
+// In normal cases, this message is sent after ViewMsg_WorkerCreated is sent.
+// But if the shared worker of the same URL already exists and it has failed
+// to load the script, when the renderer send ViewHostMsg_CreateWorker before
+// the shared worker is killed only ViewMsg_WorkerScriptLoadFailed is sent.
+IPC_MESSAGE_ROUTED0(ViewMsg_WorkerScriptLoadFailed)
+
+// Sent when the worker has connected.
+// This message is sent only if the worker successfully loaded the script.
+IPC_MESSAGE_ROUTED0(ViewMsg_WorkerConnected)
 
 // Tells the renderer that the network state has changed and that
 // window.navigator.onLine should be updated for all WebViews.
@@ -1276,8 +891,8 @@ IPC_MESSAGE_ROUTED1(ViewMsg_SetAccessibilityMode,
 
 // An acknowledge to ViewHostMsg_MultipleTargetsTouched to notify the renderer
 // process to release the magnified image.
-IPC_MESSAGE_ROUTED1(ViewMsg_ReleaseDisambiguationPopupDIB,
-                    TransportDIB::Handle /* DIB handle */)
+IPC_MESSAGE_ROUTED1(ViewMsg_ReleaseDisambiguationPopupBitmap,
+                    cc::SharedBitmapId /* id */)
 
 // Notifies the renderer that a snapshot has been retrieved.
 IPC_MESSAGE_ROUTED3(ViewMsg_WindowSnapshotCompleted,
@@ -1285,11 +900,23 @@ IPC_MESSAGE_ROUTED3(ViewMsg_WindowSnapshotCompleted,
                     gfx::Size /* size */,
                     std::vector<unsigned char> /* png */)
 
+#if defined(OS_MACOSX)
+IPC_ENUM_TRAITS_MAX_VALUE(blink::ScrollerStyle, blink::ScrollerStyleOverlay);
+
+// Notification of a change in scrollbar appearance and/or behavior.
+IPC_MESSAGE_CONTROL5(ViewMsg_UpdateScrollbarTheme,
+                     float /* initial_button_delay */,
+                     float /* autoscroll_button_delay */,
+                     bool /* jump_on_track_click */,
+                     blink::ScrollerStyle /* preferred_scroller_style */,
+                     bool /* redraw */)
+#endif
+
+#if defined(OS_ANDROID)
 // Tells the renderer to suspend/resume the webkit timers.
 IPC_MESSAGE_CONTROL1(ViewMsg_SetWebKitSharedTimersSuspended,
                      bool /* suspend */)
 
-#if defined(OS_ANDROID)
 // Sent when the browser wants the bounding boxes of the current find matches.
 //
 // If match rects are already cached on the browser side, |current_version|
@@ -1308,10 +935,6 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SelectPopupMenuItems,
                     bool /* user canceled the popup */,
                     std::vector<int> /* selected indices */)
 
-// Tells the renderer to try to revert to the zoom level we were at before
-// ViewMsg_ScrollFocusedEditableNodeIntoView was called.
-IPC_MESSAGE_ROUTED0(ViewMsg_UndoScrollFocusedEditableNodeIntoView)
-
 // Notifies the renderer whether hiding/showing the top controls is enabled
 // and whether or not to animate to the proper state.
 IPC_MESSAGE_ROUTED3(ViewMsg_UpdateTopControlsState,
@@ -1332,6 +955,11 @@ IPC_MESSAGE_ROUTED0(ViewMsg_ImeEventAck)
 // Sent by the browser when we should pause video playback.
 IPC_MESSAGE_ROUTED0(ViewMsg_PauseVideo);
 
+// Extracts the data at the given rect, returning it through the
+// ViewHostMsg_SmartClipDataExtracted IPC.
+IPC_MESSAGE_ROUTED1(ViewMsg_ExtractSmartClipData,
+                    gfx::Rect /* rect */)
+
 #elif defined(OS_MACOSX)
 // Let the RenderView know its window has changed visibility.
 IPC_MESSAGE_ROUTED1(ViewMsg_SetWindowVisibility,
@@ -1349,7 +977,7 @@ IPC_MESSAGE_ROUTED1(ViewMsg_SetInLiveResize,
 
 // Tell the renderer that plugin IME has completed.
 IPC_MESSAGE_ROUTED2(ViewMsg_PluginImeCompositionCompleted,
-                    string16 /* text */,
+                    base::string16 /* text */,
                     int /* plugin_id */)
 
 // External popup menus.
@@ -1368,10 +996,6 @@ IPC_MESSAGE_ROUTED2(ViewMsg_ReclaimCompositorResources,
                     uint32 /* output_surface_id */,
                     cc::CompositorFrameAck /* ack */)
 
-// Sent by the browser to ask the renderer for a snapshot of the current view.
-IPC_MESSAGE_ROUTED1(ViewMsg_Snapshot,
-                    gfx::Rect /* src_subrect */)
-
 // -----------------------------------------------------------------------------
 // Messages sent from the renderer to the browser.
 
@@ -1390,7 +1014,7 @@ IPC_SYNC_MESSAGE_CONTROL1_4(ViewHostMsg_CreateWindow,
 // contains the widget being created.
 IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_CreateWidget,
                             int /* opener_id */,
-                            WebKit::WebPopupType /* popup type */,
+                            blink::WebPopupType /* popup type */,
                             int /* route_id */,
                             int32 /* surface_id */)
 
@@ -1414,10 +1038,6 @@ IPC_SYNC_MESSAGE_CONTROL0_2(ViewHostMsg_GetAudioHardwareConfig,
 IPC_SYNC_MESSAGE_CONTROL0_1(ViewHostMsg_GetCPUUsage,
                             int /* CPU usage in percents */)
 
-// Asks the browser for the user's monitor profile.
-IPC_SYNC_MESSAGE_CONTROL0_1(ViewHostMsg_GetMonitorColorProfile,
-                            std::vector<char> /* profile */)
-
 // Asks the browser for the renderer process memory size stats.
 IPC_SYNC_MESSAGE_CONTROL0_2(ViewHostMsg_GetProcessMemorySizes,
                             size_t /* private_bytes */,
@@ -1476,29 +1096,12 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_UpdateScreenRects_ACK)
 IPC_MESSAGE_ROUTED1(ViewHostMsg_RequestMove,
                     gfx::Rect /* position */)
 
-// Notifies the browser that a frame in the view has changed. This message
-// has a lot of parameters and is packed/unpacked by functions defined in
-// render_messages.h.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_FrameNavigate,
-                    ViewHostMsg_FrameNavigate_Params)
-
-// Used to tell the parent that the user right clicked on an area of the
-// content area, and a context menu should be shown for it. The params
-// object contains information about the node(s) that were selected when the
-// user right clicked.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_ContextMenu, content::ContextMenuParams)
-
-// Message to show a popup menu using native cocoa controls (Mac only).
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+// Message to show/hide a popup menu using native controls.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_ShowPopup,
                     ViewHostMsg_ShowPopup_Params)
-
-// Response from ViewMsg_ScriptEvalRequest. The ID is the parameter supplied
-// to ViewMsg_ScriptEvalRequest. The result has the value returned by the
-// script as its only element, one of Null, Boolean, Integer, Real, Date, or
-// String.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_ScriptEvalResponse,
-                    int  /* id */,
-                    base::ListValue  /* result */)
+IPC_MESSAGE_ROUTED0(ViewHostMsg_HidePopup)
+#endif
 
 // Result of string search in the page.
 // Response to ViewMsg_Find with the results of the requested find-in-page
@@ -1513,52 +1116,22 @@ IPC_MESSAGE_ROUTED5(ViewHostMsg_Find_Reply,
                     int /* active_match_ordinal */,
                     bool /* final_update */)
 
-// Provides the result from running OnMsgShouldClose.  |proceed| matches the
-// return value of the the frame's shouldClose method (which includes the
-// onbeforeunload handler): true if the user decided to proceed with leaving
-// the page.
-IPC_MESSAGE_ROUTED3(ViewHostMsg_ShouldClose_ACK,
-                    bool /* proceed */,
-                    base::TimeTicks /* before_unload_start_time */,
-                    base::TimeTicks /* before_unload_end_time */)
-
-// Indicates that the current renderer has swapped out, after a SwapOut
-// message.
-IPC_MESSAGE_ROUTED0(ViewHostMsg_SwapOut_ACK)
-
 // Indicates that the current page has been closed, after a ClosePage
 // message.
 IPC_MESSAGE_ROUTED0(ViewHostMsg_ClosePage_ACK)
 
-// Notifies the browser that media has started/stopped playing.
-IPC_MESSAGE_ROUTED4(ViewHostMsg_MediaNotification,
-                    int64 /* player_cookie, distinguishes instances */,
-                    bool /* has_video */,
-                    bool /* has_audio */,
-                    bool /* is_playing */)
-
 // Notifies the browser that we have session history information.
 // page_id: unique ID that allows us to distinguish between history entries.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateState,
                     int32 /* page_id */,
                     content::PageState /* state */)
 
-// Notifies the browser that a document has been loaded in a frame.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_DocumentLoadedInFrame,
-                    int64 /* frame_id */)
-
-// Notifies the browser that a frame finished loading.
-IPC_MESSAGE_ROUTED3(ViewHostMsg_DidFinishLoad,
-                    int64 /* frame_id */,
-                    GURL /* validated_url */,
-                    bool /* is_main_frame */)
-
 // Changes the title for the page in the UI when the page is navigated or the
 // title changes.
 IPC_MESSAGE_ROUTED3(ViewHostMsg_UpdateTitle,
                     int32 /* page_id */,
-                    string16 /* title */,
-                    WebKit::WebTextDirection /* title direction */)
+                    base::string16 /* title */,
+                    blink::WebTextDirection /* title direction */)
 
 // Change the encoding name of the page in UI when the page has detected
 // proper encoding name.
@@ -1571,33 +1144,15 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateTargetURL,
                     int32,
                     GURL)
 
-// Sent when the renderer starts loading the page. This corresponds to
-// WebKit's notion of the throbber starting. Note that sometimes you may get
-// duplicates of these during a single load.
-IPC_MESSAGE_ROUTED0(ViewHostMsg_DidStartLoading)
-
-// Sent when the renderer is done loading a page. This corresponds to WebKit's
-// notion of the throbber stopping.
-IPC_MESSAGE_ROUTED0(ViewHostMsg_DidStopLoading)
-
 // Sent when the renderer main frame has made progress loading.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_DidChangeLoadProgress,
                     double /* load_progress */)
 
-// Sent when the renderer main frame sets its opener to null, disowning it for
-// the lifetime of the window.
-IPC_MESSAGE_ROUTED0(ViewHostMsg_DidDisownOpener)
-
 // Sent when the document element is available for the top-level frame.  This
 // happens after the page starts loading, but before all resources are
 // finished.
 IPC_MESSAGE_ROUTED0(ViewHostMsg_DocumentAvailableInMainFrame)
 
-// Sent when after the onload handler has been invoked for the document
-// in the top-level frame.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_DocumentOnLoadCompletedInMainFrame,
-                    int32 /* page_id */)
-
 // Sent when the renderer loads a resource from its memory cache.
 // The security info is non empty if the resource was originally loaded over
 // a secure connection.
@@ -1617,24 +1172,6 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_DidRunInsecureContent,
                     std::string  /* security_origin */,
                     GURL         /* target URL */)
 
-IPC_MESSAGE_ROUTED5(ViewHostMsg_DidFailLoadWithError,
-                    int64 /* frame_id */,
-                    GURL /* validated_url */,
-                    bool /* is_main_frame */,
-                    int /* error_code */,
-                    string16 /* error_description */)
-
-// Sent when the renderer fails a provisional load with an error.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_DidFailProvisionalLoadWithError,
-                    ViewHostMsg_DidFailProvisionalLoadWithError_Params)
-
-// Tells the render view that a ViewHostMsg_PaintAtSize message was
-// processed, and the DIB is ready for use. |tag| has the same value that
-// the tag sent along with ViewMsg_PaintAtSize.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_PaintAtSize_ACK,
-                    int /* tag */,
-                    gfx::Size /* size */)
-
 // Sent to update part of the view.  In response to this message, the host
 // generates a ViewMsg_UpdateRect_ACK message.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_UpdateRect,
@@ -1649,26 +1186,6 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_UpdateIsDelayed)
 IPC_MESSAGE_ROUTED1(ViewHostMsg_DidActivateAcceleratedCompositing,
                     bool /* true if the accelerated compositor is actve */)
 
-IPC_STRUCT_BEGIN(ViewHostMsg_BeginSmoothScroll_Params)
-  IPC_STRUCT_MEMBER(bool, scroll_down)
-  IPC_STRUCT_MEMBER(int32, pixels_to_scroll)
-  IPC_STRUCT_MEMBER(int32, mouse_event_x)
-  IPC_STRUCT_MEMBER(int32, mouse_event_y)
-IPC_STRUCT_END()
-
-IPC_MESSAGE_ROUTED1(ViewHostMsg_BeginSmoothScroll,
-                    ViewHostMsg_BeginSmoothScroll_Params /* params */)
-
-IPC_STRUCT_BEGIN(ViewHostMsg_BeginPinch_Params)
-  IPC_STRUCT_MEMBER(bool, zoom_in)
-  IPC_STRUCT_MEMBER(int32, pixels_to_move)
-  IPC_STRUCT_MEMBER(int32, anchor_x)
-  IPC_STRUCT_MEMBER(int32, anchor_y)
-IPC_STRUCT_END()
-
-IPC_MESSAGE_ROUTED1(ViewHostMsg_BeginPinch,
-                    ViewHostMsg_BeginPinch_Params /* params */)
-
 IPC_MESSAGE_ROUTED0(ViewHostMsg_Focus)
 IPC_MESSAGE_ROUTED0(ViewHostMsg_Blur)
 
@@ -1678,22 +1195,29 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_Blur)
 IPC_MESSAGE_ROUTED1(ViewHostMsg_FocusedNodeChanged,
     bool /* is_editable_node */)
 
-IPC_MESSAGE_ROUTED1(ViewHostMsg_SetCursor,
-                    WebCursor)
+IPC_MESSAGE_ROUTED1(ViewHostMsg_SetCursor, content::WebCursor)
+
+// Message sent from renderer requesting touch emulation using mouse.
+// Shift-scrolling should be converted to pinch, if |allow_pinch| is true.
+IPC_MESSAGE_ROUTED2(ViewHostMsg_SetTouchEventEmulationEnabled,
+                    bool /* enabled */,
+                    bool /* allow_pinch */)
 
 // Used to set a cookie. The cookie is set asynchronously, but will be
 // available to a subsequent ViewHostMsg_GetCookies request.
-IPC_MESSAGE_ROUTED3(ViewHostMsg_SetCookie,
-                    GURL /* url */,
-                    GURL /* first_party_for_cookies */,
-                    std::string /* cookie */)
+IPC_MESSAGE_CONTROL4(ViewHostMsg_SetCookie,
+                     int /* render_frame_id */,
+                     GURL /* url */,
+                     GURL /* first_party_for_cookies */,
+                     std::string /* cookie */)
 
 // Used to get cookies for the given URL. This may block waiting for a
 // previous SetCookie message to be processed.
-IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_GetCookies,
-                           GURL /* url */,
-                           GURL /* first_party_for_cookies */,
-                           std::string /* cookies */)
+IPC_SYNC_MESSAGE_CONTROL3_1(ViewHostMsg_GetCookies,
+                            int /* render_frame_id */,
+                            GURL /* url */,
+                            GURL /* first_party_for_cookies */,
+                            std::string /* cookies */)
 
 // Used to get raw cookie information for the given URL. This may block
 // waiting for a previous SetCookie message to be processed.
@@ -1720,37 +1244,16 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetPlugins,
     bool /* refresh*/,
     std::vector<content::WebPluginInfo> /* plugins */)
 
-// Return information about a plugin for the given URL and MIME
-// type. If there is no matching plugin, |found| is false.
-// |actual_mime_type| is the actual mime type supported by the
-// found plugin.
-IPC_SYNC_MESSAGE_CONTROL4_3(ViewHostMsg_GetPluginInfo,
-                            int /* routing_id */,
-                            GURL /* url */,
-                            GURL /* page_url */,
-                            std::string /* mime_type */,
-                            bool /* found */,
-                            content::WebPluginInfo /* plugin info */,
-                            std::string /* actual_mime_type */)
-
-// A renderer sends this to the browser process when it wants to
-// create a plugin.  The browser will create the plugin process if
-// necessary, and will return a handle to the channel on success.
-// On error an empty string is returned.
-IPC_SYNC_MESSAGE_CONTROL4_2(ViewHostMsg_OpenChannelToPlugin,
-                            int /* routing_id */,
-                            GURL /* url */,
-                            GURL /* page_url */,
-                            std::string /* mime_type */,
-                            IPC::ChannelHandle /* channel_handle */,
-                            content::WebPluginInfo /* info */)
-
 #if defined(OS_WIN)
 IPC_MESSAGE_ROUTED1(ViewHostMsg_WindowlessPluginDummyWindowCreated,
                     gfx::NativeViewId /* dummy_activation_window */)
 
 IPC_MESSAGE_ROUTED1(ViewHostMsg_WindowlessPluginDummyWindowDestroyed,
                     gfx::NativeViewId /* dummy_activation_window */)
+
+// Asks the browser for the user's monitor profile.
+IPC_SYNC_MESSAGE_CONTROL0_1(ViewHostMsg_GetMonitorColorProfile,
+                            std::vector<char> /* profile */)
 #endif
 
 // Get the list of proxies to use for |url|, as a semicolon delimited list
@@ -1767,21 +1270,6 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_CreateWorker,
                             ViewHostMsg_CreateWorker_Params,
                             int /* route_id */)
 
-// This message is sent to the browser to see if an instance of this shared
-// worker already exists. If so, it returns exists == true. If a
-// non-empty name is passed, also validates that the url matches the url of
-// the existing worker. If a matching worker is found, the passed-in
-// document_id is associated with that worker, to ensure that the worker
-// stays alive until the document is detached.
-// The route_id returned can be used to forward messages to the worker via
-// ForwardToWorker if it exists, otherwise it should be passed in to any
-// future call to CreateWorker to avoid creating duplicate workers.
-IPC_SYNC_MESSAGE_CONTROL1_3(ViewHostMsg_LookupSharedWorker,
-                            ViewHostMsg_CreateWorker_Params,
-                            bool /* exists */,
-                            int /* route_id */,
-                            bool /* url_mismatch */)
-
 // A renderer sends this to the browser process when a document has been
 // detached. The browser will use this to constrain the lifecycle of worker
 // processes (SharedWorkers are shut down when their last associated document
@@ -1801,10 +1289,11 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_AppCacheAccessed,
                     bool /* blocked by policy */)
 
 // Initiates a download based on user actions like 'ALT+click'.
-IPC_MESSAGE_ROUTED3(ViewHostMsg_DownloadUrl,
+IPC_MESSAGE_ROUTED4(ViewHostMsg_DownloadUrl,
                     GURL     /* url */,
                     content::Referrer /* referrer */,
-                    string16 /* suggested_name */)
+                    base::string16 /* suggested_name */,
+                    bool /* use prompt for save location */)
 
 // Used to go to the session history entry at the given offset (ie, -1 will
 // return the "back" item).
@@ -1820,17 +1309,6 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_RouteCloseEvent)
 IPC_MESSAGE_ROUTED1(ViewHostMsg_RouteMessageEvent,
                     ViewMsg_PostMessage_Params)
 
-IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage,
-                           string16     /* in - alert message */,
-                           string16     /* in - default prompt */,
-                           GURL         /* in - originating page URL */,
-                           content::JavaScriptMessageType /* in - type */,
-                           bool         /* out - success */,
-                           string16     /* out - user_input field */)
-
-// Requests that the given URL be opened in the specified manner.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_OpenURL, ViewHostMsg_OpenURL_Params)
-
 // Notifies that the preferred size of the content changed.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_DidContentsPreferredSizeChange,
                     gfx::Size /* pref_size */)
@@ -1846,11 +1324,6 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_DidChangeScrollOffsetPinningForMainFrame,
                     bool /* pinned_to_left */,
                     bool /* pinned_to_right */)
 
-// Notifies that the scrollbars-visible state of the content changed.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_DidChangeScrollbarsForMainFrame,
-                    bool /* has_horizontal_scrollbar */,
-                    bool /* has_vertical_scrollbar */)
-
 // Notifies that the number of JavaScript scroll handlers changed.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_DidChangeNumWheelEvents,
                     int /* count */)
@@ -1930,13 +1403,6 @@ IPC_MESSAGE_CONTROL2(ViewHostMsg_OpenChannelToPpapiBroker,
                      int /* routing_id */,
                      base::FilePath /* path */)
 
-// Opens a Pepper file asynchronously. The response returns a file descriptor
-// and an error code from base/platform_file.h.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_AsyncOpenPepperFile,
-                     int /* routing_id */,
-                     base::FilePath /* file path */,
-                     int /* pp_open_flags */)
-
 // A renderer sends this to the browser process when it wants to access a PPAPI
 // broker. In contrast to ViewHostMsg_OpenChannelToPpapiBroker, this is called
 // for every connection.
@@ -1946,33 +1412,20 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_RequestPpapiBrokerPermission,
                     GURL /* document_url */,
                     base::FilePath /* plugin_path */)
 
-#if defined(USE_X11)
-// A renderer sends this when it needs a browser-side widget for
-// hosting a windowed plugin. id is the XID of the plugin window, for which
-// the container is created.
-IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_CreatePluginContainer,
-                           gfx::PluginWindowHandle /* id */)
-
-// Destroy a plugin container previously created using CreatePluginContainer.
-// id is the XID of the plugin window corresponding to the container that is
-// to be destroyed.
-IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_DestroyPluginContainer,
-                           gfx::PluginWindowHandle /* id */)
-#endif
-
 // Send the tooltip text for the current mouse position to the browser.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_SetTooltipText,
-                    string16 /* tooltip text string */,
-                    WebKit::WebTextDirection /* text direction hint */)
+                    base::string16 /* tooltip text string */,
+                    blink::WebTextDirection /* text direction hint */)
 
 IPC_MESSAGE_ROUTED0(ViewHostMsg_SelectRange_ACK)
 IPC_MESSAGE_ROUTED0(ViewHostMsg_MoveCaret_ACK)
 
 // Notification that the text selection has changed.
-// Note: The secound parameter is the character based offset of the string16
+// Note: The secound parameter is the character based offset of the
+// base::string16
 // text in the document.
 IPC_MESSAGE_ROUTED3(ViewHostMsg_SelectionChanged,
-                    string16 /* text covers the selection range */,
+                    base::string16 /* text covers the selection range */,
                     size_t /* the offset of the text in the document */,
                     gfx::Range /* selection range in the document */)
 
@@ -1980,21 +1433,14 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_SelectionChanged,
 IPC_MESSAGE_ROUTED1(ViewHostMsg_SelectionBoundsChanged,
                     ViewHostMsg_SelectionBounds_Params)
 
-// Asks the browser to open the color chooser.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_OpenColorChooser,
-                    int /* id */,
-                    SkColor /* color */)
-
-// Asks the browser to end the color chooser.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_EndColorChooser, int /* id */)
-
-// Change the selected color in the color chooser.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_SetSelectedColorInColorChooser,
-                    int /* id */,
-                    SkColor /* color */)
+#if defined(OS_ANDROID)
+// Notification that the selection root bounds have changed.
+IPC_MESSAGE_ROUTED1(ViewHostMsg_SelectionRootBoundsChanged,
+                    gfx::Rect /* bounds of the selection root */)
+#endif
 
 // Asks the browser to display the file chooser.  The result is returned in a
-// ViewHost_RunFileChooserResponse message.
+// ViewMsg_RunFileChooserResponse message.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_RunFileChooser,
                     content::FileChooserParams)
 
@@ -2027,39 +1473,6 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_TextInputStateChanged,
 // Required for cancelling an ongoing input method composition.
 IPC_MESSAGE_ROUTED0(ViewHostMsg_ImeCancelComposition)
 
-// WebKit and JavaScript error messages to log to the console
-// or debugger UI.
-IPC_MESSAGE_ROUTED4(ViewHostMsg_AddMessageToConsole,
-                    int32, /* log level */
-                    string16, /* msg */
-                    int32, /* line number */
-                    string16 /* source id */ )
-
-// Sent by the renderer process to indicate that a plugin instance has crashed.
-// Note: |plugin_pid| should not be trusted. The corresponding process has
-// probably died. Moreover, the ID may have been reused by a new process. Any
-// usage other than displaying it in a prompt to the user is very likely to be
-// wrong.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_CrashedPlugin,
-                    base::FilePath /* plugin_path */,
-                    base::ProcessId /* plugin_pid */)
-
-// Displays a box to confirm that the user wants to navigate away from the
-// page. Replies true if yes, false otherwise, the reply string is ignored,
-// but is included so that we can use OnJavaScriptMessageBoxClosed.
-IPC_SYNC_MESSAGE_ROUTED3_2(ViewHostMsg_RunBeforeUnloadConfirm,
-                           GURL,     /* in - originating frame URL */
-                           string16  /* in - alert message */,
-                           bool      /* in - is a reload */,
-                           bool      /* out - success */,
-                           string16  /* out - This is ignored.*/)
-
-// Sent when a provisional load on the main frame redirects.
-IPC_MESSAGE_ROUTED3(ViewHostMsg_DidRedirectProvisionalLoad,
-                    int /* page_id */,
-                    GURL /* last url */,
-                    GURL /* url redirected to */)
-
 // Sent when the renderer changes the zoom level for a particular url, so the
 // browser can update its records.  If remember is true, then url is used to
 // update the zoom level for all pages in that site.  Otherwise, the render
@@ -2097,7 +1510,7 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CompositorSurfaceBuffersSwapped_Params)
   IPC_STRUCT_MEMBER(gfx::Size, size)
   IPC_STRUCT_MEMBER(float, scale_factor)
   IPC_STRUCT_MEMBER(int32, gpu_process_host_id)
-  IPC_STRUCT_MEMBER(ui::LatencyInfo, latency_info)
+  IPC_STRUCT_MEMBER(std::vector<ui::LatencyInfo>, latency_info)
 IPC_STRUCT_END()
 
 // This message is synthesized by GpuProcessHost to pass through a swap message
@@ -2113,15 +1526,11 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_SwapCompositorFrame,
 
 // Sent by the compositor when input scroll events are dropped due to bounds
 // restricions on the root scroll offset.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_DidOverscroll,
-                    gfx::Vector2dF /* accumulated_overscroll */,
-                    gfx::Vector2dF /* current_fling_velocity */)
+IPC_MESSAGE_ROUTED1(ViewHostMsg_DidOverscroll,
+                    content::DidOverscrollParams /* params */)
 
-// Reply to a snapshot request containing whether snapshotting succeeded and the
-// SkBitmap if it succeeded.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_Snapshot,
-                    bool, /* success */
-                    SkBitmap /* bitmap */)
+// Sent by the compositor when a flinging animation is stopped.
+IPC_MESSAGE_ROUTED0(ViewHostMsg_DidStopFlinging)
 
 //---------------------------------------------------------------------------
 // Request for cryptographic operation messages:
@@ -2144,14 +1553,11 @@ IPC_MESSAGE_CONTROL3(ViewHostMsg_DidGenerateCacheableMetadata,
                      double /* expected_response_time */,
                      std::vector<char> /* data */)
 
-// Displays a JavaScript out-of-memory message in the infobar.
-IPC_MESSAGE_ROUTED0(ViewHostMsg_JSOutOfMemory)
-
 // Register a new handler for URL requests with the given scheme.
 IPC_MESSAGE_ROUTED4(ViewHostMsg_RegisterProtocolHandler,
                     std::string /* scheme */,
                     GURL /* url */,
-                    string16 /* title */,
+                    base::string16 /* title */,
                     bool /* user_gesture */)
 
 // Stores new inspector setting in the profile.
@@ -2203,35 +1609,12 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_LockMouse,
 // ViewHostMsg_UnlockMouse).
 IPC_MESSAGE_ROUTED0(ViewHostMsg_UnlockMouse)
 
-// Notifies that the initial empty document of a view has been accessed.
-// After this, it is no longer safe to show a pending navigation's URL without
-// making a URL spoof possible.
-IPC_MESSAGE_ROUTED0(ViewHostMsg_DidAccessInitialDocument)
-
-// Following message is used to communicate the values received by the
-// callback binding the JS to Cpp.
-// An instance of browser that has an automation host listening to it can
-// have a javascript send a native value (string, number, boolean) to the
-// listener in Cpp. (DomAutomationController)
-IPC_MESSAGE_ROUTED2(ViewHostMsg_DomOperationResponse,
-                    std::string  /* json_string */,
-                    int  /* automation_id */)
-
-// Sent to the browser when the renderer detects it is blocked on a pepper
-// plugin message for too long. This is also sent when it becomes unhung
-// (according to the value of is_hung). The browser can give the user the
-// option of killing the plugin.
-IPC_MESSAGE_ROUTED3(ViewHostMsg_PepperPluginHung,
-                    int /* plugin_child_id */,
-                    base::FilePath /* path */,
-                    bool /* is_hung */)
-
 // Notifies that multiple touch targets may have been pressed, and to show
 // the disambiguation popup.
 IPC_MESSAGE_ROUTED3(ViewHostMsg_ShowDisambiguationPopup,
                     gfx::Rect, /* Border of touched targets */
                     gfx::Size, /* Size of zoomed image */
-                    TransportDIB::Id /* DIB of zoomed image */)
+                    cc::SharedBitmapId /* id */)
 
 // Sent by the renderer process to check whether client 3D APIs
 // (Pepper 3D, WebGL) are explicitly blocked.
@@ -2255,23 +1638,44 @@ IPC_MESSAGE_CONTROL3(ViewHostMsg_DidLose3DContext,
 IPC_MESSAGE_ROUTED0(ViewHostMsg_WillInsertBody)
 
 // Notification that the urls for the favicon of a site has been determined.
-IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateFaviconURL,
-                    int32 /* page_id */,
+IPC_MESSAGE_ROUTED1(ViewHostMsg_UpdateFaviconURL,
                     std::vector<content::FaviconURL> /* candidates */)
 
 // Sent once a paint happens after the first non empty layout. In other words
 // after the page has painted something.
-IPC_MESSAGE_ROUTED1(ViewHostMsg_DidFirstVisuallyNonEmptyPaint,
-                    int /* page_id */)
+IPC_MESSAGE_ROUTED0(ViewHostMsg_DidFirstVisuallyNonEmptyPaint)
 
 // Sent by the renderer to the browser to start a vibration with the given
 // duration.
 IPC_MESSAGE_CONTROL1(ViewHostMsg_Vibrate,
                      int64 /* milliseconds */)
+
 // Sent by the renderer to the browser to cancel the currently running
 // vibration, if there is one.
 IPC_MESSAGE_CONTROL0(ViewHostMsg_CancelVibration)
 
+// Message sent from renderer to the browser when the element that is focused
+// has been touched. A bool is passed in this message which indicates if the
+// node is editable.
+IPC_MESSAGE_ROUTED1(ViewHostMsg_FocusedNodeTouched,
+                    bool /* editable */)
+
+// Message sent from the renderer to the browser when an HTML form has failed
+// validation constraints.
+IPC_MESSAGE_ROUTED3(ViewHostMsg_ShowValidationMessage,
+                    gfx::Rect /* anchor rectangle in root view coordinate */,
+                    base::string16 /* validation message */,
+                    base::string16 /* supplemental text */)
+
+// Message sent from the renderer to the browser when a HTML form validation
+// message should be hidden from view.
+IPC_MESSAGE_ROUTED0(ViewHostMsg_HideValidationMessage)
+
+// Message sent from the renderer to the browser when the suggested co-ordinates
+// of the anchor for a HTML form validation message have changed.
+IPC_MESSAGE_ROUTED1(ViewHostMsg_MoveValidationMessage,
+                    gfx::Rect /* anchor rectangle in root view coordinate */)
+
 #if defined(OS_ANDROID)
 // Response to ViewMsg_FindMatchRects.
 //
@@ -2313,6 +1717,13 @@ IPC_MESSAGE_CONTROL3(ViewHostMsg_RunWebAudioMediaCodec,
 IPC_MESSAGE_ROUTED1(ViewHostMsg_SetNeedsBeginFrame,
                     bool /* enabled */)
 
+// Reply to the ViewMsg_ExtractSmartClipData message.
+// TODO(juhui24.lee@samsung.com): this should be changed to a vector of structs
+// instead of encoding the data as a string which is not allowed normally. Since
+// ths is only used in Android WebView, it's allowed temporarily.
+// http://crbug.com/330872
+IPC_MESSAGE_ROUTED1(ViewHostMsg_SmartClipDataExtracted, base::string16)
+
 #elif defined(OS_MACOSX)
 // Request that the browser load a font into shared memory for us.
 IPC_SYNC_MESSAGE_CONTROL1_3(ViewHostMsg_LoadFont,
@@ -2329,13 +1740,18 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_PluginFocusChanged,
 // Instructs the browser to start plugin IME.
 IPC_MESSAGE_ROUTED0(ViewHostMsg_StartPluginIme)
 
+// Notifies that the scrollbars-visible state of the content changed.
+IPC_MESSAGE_ROUTED2(ViewHostMsg_DidChangeScrollbarsForMainFrame,
+                    bool /* has_horizontal_scrollbar */,
+                    bool /* has_vertical_scrollbar */)
+
 #elif defined(OS_WIN)
 // Request that the given font characters be loaded by the browser so it's
 // cached by the OS. Please see RenderMessageFilter::OnPreCacheFontCharacters
 // for details.
 IPC_SYNC_MESSAGE_CONTROL2_0(ViewHostMsg_PreCacheFontCharacters,
                             LOGFONT /* font_data */,
-                            string16 /* characters */)
+                            base::string16 /* characters */)
 #endif
 
 #if defined(OS_POSIX)
@@ -2359,8 +1775,8 @@ IPC_MESSAGE_CONTROL1(ViewHostMsg_FreeTransportDIB,
                      TransportDIB::Id /* DIB id */)
 #endif
 
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA)
-// On MACOSX, WIN and AURA IME can request composition character bounds
+#if defined(OS_MACOSX) || defined(USE_AURA)
+// On Mac and Aura IME can request composition character bounds
 // synchronously (see crbug.com/120597). This IPC message sends the character
 // bounds after every composition change to always have correct bound info.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_ImeCompositionRangeChanged,