diff options
Diffstat (limited to 'chrome/browser/renderer_host')
12 files changed, 40 insertions, 15 deletions
diff --git a/chrome/browser/renderer_host/async_resource_handler.cc b/chrome/browser/renderer_host/async_resource_handler.cc index 61489d3..b99fa23 100644 --- a/chrome/browser/renderer_host/async_resource_handler.cc +++ b/chrome/browser/renderer_host/async_resource_handler.cc @@ -5,6 +5,8 @@ #include "chrome/browser/renderer_host/async_resource_handler.h" #include "base/process.h" +#include "base/shared_memory.h" +#include "chrome/common/render_messages.h" #include "net/base/io_buffer.h" SharedIOBuffer* AsyncResourceHandler::spare_read_buffer_; diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index e4dbb77..7e2a579 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -986,15 +986,14 @@ void RenderViewHost::OnMsgDidDownloadImage( delegate_->DidDownloadImage(this, id, image_url, errored, image); } -void RenderViewHost::OnMsgContextMenu( - const ViewHostMsg_ContextMenu_Params& params) { +void RenderViewHost::OnMsgContextMenu(const ContextMenuParams& params) { RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); if (!view) return; // Validate the URLs in |params|. If the renderer can't request the URLs // directly, don't show them in the context menu. - ViewHostMsg_ContextMenu_Params validated_params(params); + ContextMenuParams validated_params(params); const int renderer_id = process()->host_id(); RendererSecurityPolicy* policy = RendererSecurityPolicy::GetInstance(); diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index fb8df10..4e4a638 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -26,9 +26,9 @@ class NavigationEntry; class RenderViewHostDelegate; class SiteInstance; class SkBitmap; -struct ViewHostMsg_ContextMenu_Params; -struct ViewHostMsg_DidPrintPage_Params; class ViewMsg_Navigate; +struct ContextMenuParams; +struct ViewHostMsg_DidPrintPage_Params; struct ViewMsg_Navigate_Params; struct ViewMsg_Print_Params; struct ViewMsg_PrintPages_Params; @@ -465,7 +465,7 @@ class RenderViewHost : public RenderWidgetHost { const GURL& image_url, bool errored, const SkBitmap& image_data); - void OnMsgContextMenu(const ViewHostMsg_ContextMenu_Params& params); + void OnMsgContextMenu(const ContextMenuParams& params); void OnMsgOpenURL(const GURL& url, const GURL& referrer, WindowOpenDisposition disposition); void OnMsgDomOperationResponse(const std::string& json_string, diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index 77e161d..f048dc2 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -25,7 +25,7 @@ class SkBitmap; class WebContents; class WebKeyboardEvent; struct ThumbnailScore; -struct ViewHostMsg_ContextMenu_Params; +struct ContextMenuParams; struct ViewHostMsg_DidPrintPage_Params; struct ViewHostMsg_FrameNavigate_Params; struct WebDropData; @@ -96,8 +96,7 @@ class RenderViewHostDelegate { // A context menu should be shown, to be built using the context information // provided in the supplied params. - virtual void ShowContextMenu( - const ViewHostMsg_ContextMenu_Params& params) = 0; + virtual void ShowContextMenu(const ContextMenuParams& params) = 0; // The user started dragging content of the specified type within the // RenderView. Contextual information about the dragged content is supplied diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc index 147d2a9..a03bb1b 100644 --- a/chrome/browser/renderer_host/render_widget_helper.cc +++ b/chrome/browser/renderer_host/render_widget_helper.cc @@ -8,6 +8,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" +#include "chrome/common/render_messages.h" // A Task used with InvokeLater that we hold a pointer to in pending_paints_. // Instances are deleted by MessageLoop after it calls their Run method. diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc index 166efb9..bb8c791 100644 --- a/chrome/browser/renderer_host/render_widget_host_unittest.cc +++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc @@ -7,6 +7,7 @@ #include "base/shared_memory.h" #include "build/build_config.h" #include "chrome/browser/renderer_host/test_render_view_host.h" +#include "chrome/common/render_messages.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index d6fad5e..b499669 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -19,6 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/l10n_util.h" #include "chrome/common/plugin_messages.h" +#include "chrome/common/render_messages.h" #include "chrome/common/win_util.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! #include "chrome/views/widget_win.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h index c4d08d3..ec1547a 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.h +++ b/chrome/browser/renderer_host/render_widget_host_view_win.h @@ -17,8 +17,7 @@ #include "base/task.h" #include "chrome/browser/ime_input.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/common/render_messages.h" -#include "chrome/views/focus_manager.h" +#include "webkit/glue/webcursor.h" namespace gfx { class Rect; diff --git a/chrome/browser/renderer_host/resource_handler.h b/chrome/browser/renderer_host/resource_handler.h index 9813094..8973c77 100644 --- a/chrome/browser/renderer_host/resource_handler.h +++ b/chrome/browser/renderer_host/resource_handler.h @@ -14,13 +14,34 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "chrome/common/render_messages.h" +#include "chrome/common/filter_policy.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +#include "webkit/glue/resource_loader_bridge.h" -// Simple wrapper that refcounts ViewMsg_Resource_ResponseHead. +// Parameters for a resource response header. +struct ResourceResponseHead + : webkit_glue::ResourceLoaderBridge::ResponseInfo { + // The response status. + URLRequestStatus status; + + // Specifies if the resource should be filtered before being displayed + // (insecure resources can be filtered to keep the page secure). + FilterPolicy::Type filter_policy; +}; + +// Parameters for a synchronous resource response. +struct SyncLoadResult : ResourceResponseHead { + // The final URL after any redirects. + GURL final_url; + + // The response data. + std::string data; +}; + +// Simple wrapper that refcounts ResourceResponseHead. struct ResourceResponse : public base::RefCounted<ResourceResponse> { - ViewMsg_Resource_ResponseHead response_head; + ResourceResponseHead response_head; }; // The resource dispatcher host uses this interface to push load events to the diff --git a/chrome/browser/renderer_host/sync_resource_handler.cc b/chrome/browser/renderer_host/sync_resource_handler.cc index a30f10f..c21e7e7 100644 --- a/chrome/browser/renderer_host/sync_resource_handler.cc +++ b/chrome/browser/renderer_host/sync_resource_handler.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/renderer_host/sync_resource_handler.h" +#include "chrome/common/render_messages.h" SyncResourceHandler::SyncResourceHandler( ResourceDispatcherHost::Receiver* receiver, diff --git a/chrome/browser/renderer_host/sync_resource_handler.h b/chrome/browser/renderer_host/sync_resource_handler.h index 012ab9e..82cebbc 100644 --- a/chrome/browser/renderer_host/sync_resource_handler.h +++ b/chrome/browser/renderer_host/sync_resource_handler.h @@ -28,7 +28,7 @@ class SyncResourceHandler : public ResourceHandler { enum { kReadBufSize = 3840 }; scoped_refptr<net::IOBuffer> read_buffer_; - ViewHostMsg_SyncLoad_Result result_; + SyncLoadResult result_; ResourceDispatcherHost::Receiver* receiver_; IPC::Message* result_message_; }; diff --git a/chrome/browser/renderer_host/test_render_view_host.cc b/chrome/browser/renderer_host/test_render_view_host.cc index 4442138..2129e47 100644 --- a/chrome/browser/renderer_host/test_render_view_host.cc +++ b/chrome/browser/renderer_host/test_render_view_host.cc @@ -4,6 +4,7 @@ #include "chrome/browser/renderer_host/test_render_view_host.h" #include "chrome/browser/tab_contents/test_web_contents.h" +#include "chrome/common/render_messages.h" TestRenderViewHost::TestRenderViewHost(SiteInstance* instance, RenderViewHostDelegate* delegate, |