diff options
Diffstat (limited to 'chrome')
60 files changed, 227 insertions, 249 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index d36fa34..c223d3d 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -26,6 +26,7 @@ #include "chrome/common/ipc_message.h" #include "chrome/common/notification_observer.h" #include "chrome/views/event.h" +#include "webkit/glue/find_in_page_request.h" class LoginHandler; class NavigationControllerRestoredObserver; diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 2b4cfa8..5c4fd8b 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -471,7 +471,6 @@ input_files = ChromeFileList([ 'browser_accessibility.h', 'browser_accessibility_manager.cc', 'browser_accessibility_manager.h', - 'iaccessible_function_ids.h', ]), MSVSFilter('Download', [ 'download/download_exe.cc', diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 0947371..1dd27d8 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -1785,10 +1785,6 @@ RelativePath=".\browser_accessibility_manager.h" > </File> - <File - RelativePath=".\iaccessible_function_ids.h" - > - </File> </Filter> <Filter Name="Download" diff --git a/chrome/browser/browser_accessibility.cc b/chrome/browser/browser_accessibility.cc index 8dc85b4..37bb09c 100644 --- a/chrome/browser/browser_accessibility.cc +++ b/chrome/browser/browser_accessibility.cc @@ -4,9 +4,9 @@ #include "chrome/browser/browser_accessibility.h" +#include "base/logging.h" #include "chrome/browser/browser_accessibility_manager.h" -#include "chrome/browser/iaccessible_function_ids.h" -#include "chrome/common/render_messages.h" +#include "chrome/common/accessibility.h" BrowserAccessibility::BrowserAccessibility() : iaccessible_id_(-1), @@ -547,7 +547,7 @@ bool BrowserAccessibility::RequestAccessibilityInfo(int iaccessible_func_id, input2); } -const ViewHostMsg_Accessibility_Out_Params& BrowserAccessibility::response() { +const AccessibilityOutParams& BrowserAccessibility::response() { return BrowserAccessibilityManager::GetInstance()->response(); } diff --git a/chrome/browser/browser_accessibility.h b/chrome/browser/browser_accessibility.h index 5f2b40d..fcb18b5 100644 --- a/chrome/browser/browser_accessibility.h +++ b/chrome/browser/browser_accessibility.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" -struct ViewHostMsg_Accessibility_Out_Params; +struct AccessibilityOutParams; //////////////////////////////////////////////////////////////////////////////// // @@ -146,7 +146,7 @@ class ATL_NO_VTABLE BrowserAccessibility LONG input1, LONG input2); // Accessors. - const ViewHostMsg_Accessibility_Out_Params& response(); + const AccessibilityOutParams& response(); HWND parent_hwnd(); // Id to uniquely distinguish this instance in the render-side caching, diff --git a/chrome/browser/browser_accessibility_manager.cc b/chrome/browser/browser_accessibility_manager.cc index 69255be..fa72ae5 100644 --- a/chrome/browser/browser_accessibility_manager.cc +++ b/chrome/browser/browser_accessibility_manager.cc @@ -8,6 +8,7 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/common/notification_service.h" +#include "chrome/common/render_messages.h" // The time in ms after which we give up and return an error when processing an // accessibility message and no response has been received from the renderer. @@ -80,7 +81,7 @@ bool BrowserAccessibilityManager::RequestAccessibilityInfo( int iaccessible_id, int instance_id, int iaccessible_func_id, VARIANT var_id, LONG input1, LONG input2) { // Create and populate input message structure. - ViewMsg_Accessibility_In_Params in_params; + AccessibilityInParams in_params; in_params.iaccessible_id = iaccessible_id; in_params.iaccessible_function_id = iaccessible_func_id; @@ -116,8 +117,7 @@ bool BrowserAccessibilityManager::RequestAccessibilityInfo( return success; } -const ViewHostMsg_Accessibility_Out_Params& -BrowserAccessibilityManager::response() { +const AccessibilityOutParams& BrowserAccessibilityManager::response() { return out_params_; } diff --git a/chrome/browser/browser_accessibility_manager.h b/chrome/browser/browser_accessibility_manager.h index dcda60c..83fe732 100644 --- a/chrome/browser/browser_accessibility_manager.h +++ b/chrome/browser/browser_accessibility_manager.h @@ -9,13 +9,12 @@ #include <hash_map> #include "base/singleton.h" +#include "chrome/common/accessibility.h" #include "chrome/common/notification_observer.h" -#include "chrome/common/render_messages.h" class BrowserAccessibility; class RenderProcessHost; class RenderWidgetHost; -struct ViewHostMsg_Accessibility_Out_Params; //////////////////////////////////////////////////////////////////////////////// // @@ -53,7 +52,7 @@ class BrowserAccessibilityManager : public NotificationObserver { LONG input2); // Wrapper function, for cleaner code. - const ViewHostMsg_Accessibility_Out_Params& response(); + const AccessibilityOutParams& response(); // Retrieves the parent HWND connected to the provided id. HWND parent_hwnd(int id); @@ -102,7 +101,7 @@ class BrowserAccessibilityManager : public NotificationObserver { // mapping, and the connected BrowserAccessibility ids/instances invalidated. RenderProcessHostMap render_process_host_map_; - ViewHostMsg_Accessibility_Out_Params out_params_; + AccessibilityOutParams out_params_; DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager); }; diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index 38a941f..9b67490 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -36,6 +36,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/net/url_request_intercept_job.h" #include "chrome/common/plugin_messages.h" +#include "chrome/common/render_messages.h" #include "base/gfx/png_encoder.h" #include "base/logging.h" diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index d299bec..0bfcd6fa 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -43,6 +43,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" +#include "chrome/common/thumbnail_score.h" #include "chromium_strings.h" #include "generated_resources.h" diff --git a/chrome/browser/iaccessible_function_ids.h b/chrome/browser/iaccessible_function_ids.h deleted file mode 100644 index 4f97681..0000000 --- a/chrome/browser/iaccessible_function_ids.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This defines an enumeration of IDs that can uniquely identify a call to a -// specific IAccessible function. Should match the support implemented in WebKit -// (functions marked with return value E_NOTIMPL are also excluded). - -#ifndef CHROME_BROWSER_IACCESSIBLE_FUNCTION_IDS_H_ -#define CHROME_BROWSER_IACCESSIBLE_FUNCTION_IDS_H_ - -enum IAccessibleID { - IACCESSIBLE_FUNC_NONE = 0, - - // Supported IAccessible interface functions. - IACCESSIBLE_FUNC_ACCDODEFAULTACTION, - IACCESSIBLE_FUNC_ACCHITTEST, - IACCESSIBLE_FUNC_ACCLOCATION, - IACCESSIBLE_FUNC_ACCNAVIGATE, - IACCESSIBLE_FUNC_GET_ACCCHILD, - IACCESSIBLE_FUNC_GET_ACCCHILDCOUNT, - IACCESSIBLE_FUNC_GET_ACCDEFAULTACTION, - IACCESSIBLE_FUNC_GET_ACCDESCRIPTION, - IACCESSIBLE_FUNC_GET_ACCFOCUS, - IACCESSIBLE_FUNC_GET_ACCHELP, - IACCESSIBLE_FUNC_GET_ACCKEYBOARDSHORTCUT, - IACCESSIBLE_FUNC_GET_ACCNAME, - IACCESSIBLE_FUNC_GET_ACCPARENT, - IACCESSIBLE_FUNC_GET_ACCROLE, - IACCESSIBLE_FUNC_GET_ACCSTATE, - IACCESSIBLE_FUNC_GET_ACCVALUE - - // The deprecated put_accName and put_accValue are not supported here, nor is - // accSelect, get_accHelpTopic and get_accSelection (matching WebKit's - // support). -}; - -#endif // CHROME_BROWSER_IACCESSIBLE_FUNCTION_IDS_H_ diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index f3822e8..7c400c3 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -181,6 +181,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "chrome/common/render_messages.h" #include "chrome/installer/util/google_update_settings.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/navigation_controller_unittest.cc b/chrome/browser/navigation_controller_unittest.cc index cfeb697..0bdd613 100644 --- a/chrome/browser/navigation_controller_unittest.cc +++ b/chrome/browser/navigation_controller_unittest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/tab_contents/tab_contents_factory.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" +#include "chrome/common/render_messages.h" #include "chrome/common/stl_util-inl.h" #include "chrome/test/test_notification_tracker.h" #include "chrome/test/test_tab_contents.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 4e017e8..c21688f 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -15,6 +15,7 @@ #include "chrome/common/gfx/emf.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" +#include "chrome/common/render_messages.h" #include "generated_resources.h" 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, diff --git a/chrome/browser/resource_message_filter.cc b/chrome/browser/resource_message_filter.cc index ec75986..8d404c5 100644 --- a/chrome/browser/resource_message_filter.cc +++ b/chrome/browser/resource_message_filter.cc @@ -231,9 +231,8 @@ bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& message) { void ResourceMessageFilter::OnReceiveContextMenuMsg(const IPC::Message& msg) { void* iter = NULL; - ViewHostMsg_ContextMenu_Params params; - if (!IPC::ParamTraits<ViewHostMsg_ContextMenu_Params>:: - Read(&msg, &iter, ¶ms)) + ContextMenuParams params; + if (!IPC::ParamTraits<ContextMenuParams>::Read(&msg, &iter, ¶ms)) return; // Fill in the dictionary suggestions if required. diff --git a/chrome/browser/resource_message_filter.h b/chrome/browser/resource_message_filter.h index af9d604..e517402 100644 --- a/chrome/browser/resource_message_filter.h +++ b/chrome/browser/resource_message_filter.h @@ -13,6 +13,7 @@ #include "build/build_config.h" #include "chrome/browser/net/resolve_proxy_msg_helper.h" #include "chrome/common/ipc_channel_proxy.h" +#include "chrome/common/modal_dialog_event.h" #include "chrome/common/notification_observer.h" #include "webkit/glue/cache_manager.h" diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h index 3294e42..2c013a9 100644 --- a/chrome/browser/ssl/ssl_manager.h +++ b/chrome/browser/ssl/ssl_manager.h @@ -16,7 +16,6 @@ #include "chrome/browser/tab_contents/security_style.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/render_messages.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/ssl_info.h" diff --git a/chrome/browser/tab_contents/infobar_delegate.h b/chrome/browser/tab_contents/infobar_delegate.h index 5ec5309..271ec00 100644 --- a/chrome/browser/tab_contents/infobar_delegate.h +++ b/chrome/browser/tab_contents/infobar_delegate.h @@ -10,6 +10,7 @@ #include "base/basictypes.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "skia/include/SkBitmap.h" +#include "webkit/glue/window_open_disposition.h" class AlertInfoBarDelegate; class ConfirmInfoBarDelegate; diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index dceab2e..88d81ec 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -17,6 +17,7 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/navigation_types.h" #include "chrome/common/notification_service.h" +#include "chrome/common/render_messages.h" #include "chrome/common/resource_bundle.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h index ab76e7a..2a6dea5 100644 --- a/chrome/browser/tab_contents/navigation_controller.h +++ b/chrome/browser/tab_contents/navigation_controller.h @@ -13,11 +13,13 @@ #include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/tab_contents/tab_contents_type.h" #include "chrome/common/navigation_types.h" +#include "chrome/common/page_transition_types.h" class GURL; class Profile; class TabContents; class SiteInstance; +class SkBitmap; class WebContents; class TabContentsCollector; class TabNavigation; diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 9d36be5..77455fe 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -11,8 +11,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/spellchecker.h" #include "chrome/common/l10n_util.h" -#include "webkit/glue/context_node_types.h" - #include "generated_resources.h" RenderViewContextMenu::RenderViewContextMenu( diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h index 6d55c03..d5fae49 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.h +++ b/chrome/browser/tab_contents/render_view_context_menu.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_H_ #include "chrome/views/menu.h" -#include "webkit/glue/context_node_types.h" +#include "webkit/glue/context_menu.h" class Profile; diff --git a/chrome/browser/tab_contents/render_view_context_menu_controller.cc b/chrome/browser/tab_contents/render_view_context_menu_controller.cc index 4b3a245..7a43ff3 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_controller.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_controller.cc @@ -34,8 +34,7 @@ #include "generated_resources.h" RenderViewContextMenuController::RenderViewContextMenuController( - WebContents* source_web_contents, - const ViewHostMsg_ContextMenu_Params& params) + WebContents* source_web_contents, const ContextMenuParams& params) : source_web_contents_(source_web_contents), params_(params) { } diff --git a/chrome/browser/tab_contents/render_view_context_menu_controller.h b/chrome/browser/tab_contents/render_view_context_menu_controller.h index 89270b5..b2e5676 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_controller.h +++ b/chrome/browser/tab_contents/render_view_context_menu_controller.h @@ -6,15 +6,17 @@ #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H_ #include "chrome/common/pref_member.h" +#include "chrome/common/page_transition_types.h" #include "chrome/views/menu.h" -#include "chrome/common/render_messages.h" +#include "webkit/glue/context_menu.h" +#include "webkit/glue/window_open_disposition.h" class WebContents; class RenderViewContextMenuController : public Menu::Delegate { public: RenderViewContextMenuController(WebContents* source_web_contents, - const ViewHostMsg_ContextMenu_Params& params); + const ContextMenuParams& params); virtual ~RenderViewContextMenuController(); // Overridden from Menu::Delegate @@ -47,7 +49,7 @@ class RenderViewContextMenuController : public Menu::Delegate { private: WebContents* source_web_contents_; - ViewHostMsg_ContextMenu_Params params_; + ContextMenuParams params_; StringPrefMember dictionary_language_; int current_dictionary_language_index_; }; diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index cf365b3..e3cb28d 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/gfx/rect.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/infobar_delegate.h" diff --git a/chrome/browser/tab_contents/view_source_contents.cc b/chrome/browser/tab_contents/view_source_contents.cc index 291b0c3..be95c5b 100644 --- a/chrome/browser/tab_contents/view_source_contents.cc +++ b/chrome/browser/tab_contents/view_source_contents.cc @@ -6,6 +6,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/navigation_entry.h" +#include "chrome/common/render_messages.h" ViewSourceContents::ViewSourceContents(Profile* profile, SiteInstance* instance) : WebContents(profile, instance, NULL, MSG_ROUTING_NONE, NULL) { diff --git a/chrome/browser/tab_contents/web_contents_view_win.cc b/chrome/browser/tab_contents/web_contents_view_win.cc index b72a697..522f8a1 100644 --- a/chrome/browser/tab_contents/web_contents_view_win.cc +++ b/chrome/browser/tab_contents/web_contents_view_win.cc @@ -26,6 +26,8 @@ #include "chrome/common/os_exchange_data.h" #include "net/base/net_util.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" +#include "webkit/glue/webdropdata.h" +#include "webkit/glue/webinputevent.h" namespace { @@ -334,8 +336,7 @@ void WebContentsViewWin::OnFindReply(int request_id, } } -void WebContentsViewWin::ShowContextMenu( - const ViewHostMsg_ContextMenu_Params& params) { +void WebContentsViewWin::ShowContextMenu(const ContextMenuParams& params) { RenderViewContextMenuController menu_controller(web_contents_, params); RenderViewContextMenu menu(&menu_controller, GetHWND(), diff --git a/chrome/browser/tab_contents/web_contents_view_win.h b/chrome/browser/tab_contents/web_contents_view_win.h index 543efb4..4edb6f5 100644 --- a/chrome/browser/tab_contents/web_contents_view_win.h +++ b/chrome/browser/tab_contents/web_contents_view_win.h @@ -58,8 +58,7 @@ class WebContentsViewWin : public WebContentsView, bool user_gesture); virtual void ShowCreatedWidgetInternal(RenderWidgetHostView* widget_host_view, const gfx::Rect& initial_pos); - virtual void ShowContextMenu( - const ViewHostMsg_ContextMenu_Params& params); + virtual void ShowContextMenu(const ContextMenuParams& params); virtual void StartDragging(const WebDropData& drop_data); virtual void UpdateDragCursor(bool is_drop_target); virtual void TakeFocus(bool reverse); diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index 8e8b6e7..aa93002 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -1454,7 +1454,6 @@ 4D7BF88F0E9D4839009A6919 /* history_tab_ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = history_tab_ui.h; sourceTree = "<group>"; }; 4D7BF8900E9D4839009A6919 /* history_view.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = history_view.cc; sourceTree = "<group>"; }; 4D7BF8910E9D4839009A6919 /* history_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = history_view.h; sourceTree = "<group>"; }; - 4D7BF8920E9D4839009A6919 /* iaccessible_function_ids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iaccessible_function_ids.h; sourceTree = "<group>"; }; 4D7BF8930E9D4839009A6919 /* icon_loader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = icon_loader.cc; sourceTree = "<group>"; }; 4D7BF8940E9D4839009A6919 /* icon_loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icon_loader.h; sourceTree = "<group>"; }; 4D7BF8950E9D4839009A6919 /* icon_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = icon_manager.cc; sourceTree = "<group>"; }; @@ -2645,7 +2644,6 @@ 4D7BF88F0E9D4839009A6919 /* history_tab_ui.h */, 4D7BF8900E9D4839009A6919 /* history_view.cc */, 4D7BF8910E9D4839009A6919 /* history_view.h */, - 4D7BF8920E9D4839009A6919 /* iaccessible_function_ids.h */, 4D7BF8930E9D4839009A6919 /* icon_loader.cc */, 4D7BF8940E9D4839009A6919 /* icon_loader.h */, 4D7BF8950E9D4839009A6919 /* icon_manager.cc */, diff --git a/chrome/common/accessibility.h b/chrome/common/accessibility.h new file mode 100644 index 0000000..11272a5 --- /dev/null +++ b/chrome/common/accessibility.h @@ -0,0 +1,86 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_COMMON_ACCESSIBILITY_H_ +#define CHROME_COMMON_ACCESSIBILITY_H_ + +// This defines an enumeration of IDs that can uniquely identify a call to a +// specific IAccessible function. Should match the support implemented in WebKit +// (functions marked with return value E_NOTIMPL are also excluded). +enum IAccessibleID { + IACCESSIBLE_FUNC_NONE = 0, + + // Supported IAccessible interface functions. + IACCESSIBLE_FUNC_ACCDODEFAULTACTION, + IACCESSIBLE_FUNC_ACCHITTEST, + IACCESSIBLE_FUNC_ACCLOCATION, + IACCESSIBLE_FUNC_ACCNAVIGATE, + IACCESSIBLE_FUNC_GET_ACCCHILD, + IACCESSIBLE_FUNC_GET_ACCCHILDCOUNT, + IACCESSIBLE_FUNC_GET_ACCDEFAULTACTION, + IACCESSIBLE_FUNC_GET_ACCDESCRIPTION, + IACCESSIBLE_FUNC_GET_ACCFOCUS, + IACCESSIBLE_FUNC_GET_ACCHELP, + IACCESSIBLE_FUNC_GET_ACCKEYBOARDSHORTCUT, + IACCESSIBLE_FUNC_GET_ACCNAME, + IACCESSIBLE_FUNC_GET_ACCPARENT, + IACCESSIBLE_FUNC_GET_ACCROLE, + IACCESSIBLE_FUNC_GET_ACCSTATE, + IACCESSIBLE_FUNC_GET_ACCVALUE + + // The deprecated put_accName and put_accValue are not supported here, nor is + // accSelect, get_accHelpTopic and get_accSelection (matching WebKit's + // support). +}; + +// Parameters structure to hold a union of the possible IAccessible function +// INPUT variables, with the unused fields always set to default value. Used in +// ViewMsg_GetAccessibilityInfo, as only parameter. +struct AccessibilityInParams { + // Identifier to uniquely distinguish which instance of IAccessible is being + // called upon on the renderer side. + int iaccessible_id; + + // Identifier to resolve which IAccessible interface function is being called. + int iaccessible_function_id; + + // Function input parameters. + // Input VARIANT structure's LONG field to specify requested object. + long input_variant_lval; + + // LONG input parameters, used differently depending on the function called. + long input_long1; + long input_long2; +}; + +// Parameters structure to hold a union of the possible IAccessible function +// OUTPUT variables, with the unused fields always set to default value. Used in +// ViewHostMsg_GetAccessibilityInfoResponse, as only parameter. +struct AccessibilityOutParams { + // Identifier to uniquely distinguish which instance of IAccessible is being + // called upon on the renderer side. + int iaccessible_id; + + // Function output parameters. + // Output VARIANT structure's LONG field to specify requested object. + long output_variant_lval; + + // LONG output parameters, used differently depending on the function called. + // output_long1 can in some cases be set to -1 to indicate that the child + // object found by the called IAccessible function is not a simple object. + long output_long1; + long output_long2; + long output_long3; + long output_long4; + + // String output parameter. + std::wstring output_string; + + // Return code, either S_OK (true) or S_FALSE (false). WebKit MSAA error + // return codes (E_POINTER, E_INVALIDARG, E_FAIL, E_NOTIMPL) must be handled + // on the browser side by input validation. + bool return_code; +}; + +#endif // CHROME_COMMON_ACCESSIBILITY_H_ diff --git a/chrome/common/common.scons b/chrome/common/common.scons index 9066f8e..23fa414 100644 --- a/chrome/common/common.scons +++ b/chrome/common/common.scons @@ -99,6 +99,7 @@ input_files = ChromeFileList([ 'render_messages.h', 'render_messages_internal.h', ]), + 'accessibility.h', 'animation.cc', 'animation.h', 'child_process.cc', diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index c3986d2b..9557647 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -314,6 +314,10 @@ </File> </Filter> <File + RelativePath=".\accessibility.h" + > + </File> + <File RelativePath=".\animation.cc" > </File> diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index c1f056a..b2ef967 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -13,6 +13,8 @@ #include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" #include "base/shared_memory.h" +#include "chrome/browser/renderer_host/resource_handler.h" +#include "chrome/common/accessibility.h" #include "chrome/common/bitmap_wire_data.h" #include "chrome/common/filter_policy.h" #include "chrome/common/ipc_message_utils.h" @@ -23,7 +25,7 @@ #include "net/url_request/url_request_status.h" #include "webkit/glue/autofill_form.h" #include "webkit/glue/cache_manager.h" -#include "webkit/glue/context_node_types.h" +#include "webkit/glue/context_menu.h" #include "webkit/glue/form_data.h" #include "webkit/glue/password_form.h" #include "webkit/glue/password_form_dom_manager.h" @@ -121,61 +123,6 @@ struct ViewHostMsg_FrameNavigate_Params { bool is_content_filtered; }; -// Parameters structure for ViewHostMsg_ContextMenu, which has too many data -// parameters to be reasonably put in a predefined IPC message. -// FIXME(beng): This would be more useful in the future and more efficient -// if the parameters here weren't so literally mapped to what -// they contain for the ContextMenu task. It might be better -// to make the string fields more generic so that this object -// could be used for more contextual actions. -struct ViewHostMsg_ContextMenu_Params { - // This is the type of Context Node that the context menu was invoked on. - ContextNode node; - - // These values represent the coordinates of the mouse when the context menu - // was invoked. Coords are relative to the associated RenderView's origin. - int x; - int y; - - // This is the URL of the link that encloses the node the context menu was - // invoked on. - GURL link_url; - - // This is the URL of the image the context menu was invoked on. - GURL image_url; - - // This is the URL of the top level page that the context menu was invoked - // on. - GURL page_url; - - // This is the URL of the subframe that the context menu was invoked on. - GURL frame_url; - - // This is the text of the selection that the context menu was invoked on. - std::wstring selection_text; - - // The misspelled word under the cursor, if any. Used to generate the - // |dictionary_suggestions| list. - std::wstring misspelled_word; - - // Suggested replacements for a misspelled word under the cursor. - // This vector gets populated in the render process host - // by intercepting ViewHostMsg_ContextMenu in ResourceMessageFilter - // and populating dictionary_suggestions if the type is EDITABLE - // and the misspelled_word is not empty. - std::vector<std::wstring> dictionary_suggestions; - - // If editable, flag for whether spell check is enabled or not. - bool spellcheck_enabled; - - // These flags indicate to the browser whether the renderer believes it is - // able to perform the corresponding action. - int edit_flags; - - // The security info for the resource we are showing the menu on. - std::string security_info; -}; - // Values that may be OR'd together to form the 'flags' parameter of a // ViewHostMsg_PaintRect message. struct ViewHostMsg_PaintRect_Flags { @@ -302,26 +249,6 @@ struct ViewHostMsg_Resource_Request { std::vector<net::UploadData::Element> upload_content; }; -// Parameters for a resource response header. -struct ViewMsg_Resource_ResponseHead - : 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 ViewHostMsg_SyncLoad_Result : ViewMsg_Resource_ResponseHead { - // The final URL after any redirects. - GURL final_url; - - // The response data. - std::string data; -}; - // Parameters for a render request. struct ViewMsg_Print_Params { // In pixels according to dpi_x and dpi_y. @@ -390,55 +317,6 @@ struct ViewHostMsg_DidPrintPage_Params { double actual_shrink; }; -// Parameters structure to hold a union of the possible IAccessible function -// INPUT variables, with the unused fields always set to default value. Used in -// ViewMsg_GetAccessibilityInfo, as only parameter. -struct ViewMsg_Accessibility_In_Params { - // Identifier to uniquely distinguish which instance of IAccessible is being - // called upon on the renderer side. - int iaccessible_id; - - // Identifier to resolve which IAccessible interface function is being called. - int iaccessible_function_id; - - // Function input parameters. - // Input VARIANT structure's LONG field to specify requested object. - long input_variant_lval; - - // LONG input parameters, used differently depending on the function called. - long input_long1; - long input_long2; -}; - -// Parameters structure to hold a union of the possible IAccessible function -// OUTPUT variables, with the unused fields always set to default value. Used in -// ViewHostMsg_GetAccessibilityInfoResponse, as only parameter. -struct ViewHostMsg_Accessibility_Out_Params { - // Identifier to uniquely distinguish which instance of IAccessible is being - // called upon on the renderer side. - int iaccessible_id; - - // Function output parameters. - // Output VARIANT structure's LONG field to specify requested object. - long output_variant_lval; - - // LONG output parameters, used differently depending on the function called. - // output_long1 can in some cases be set to -1 to indicate that the child - // object found by the called IAccessible function is not a simple object. - long output_long1; - long output_long2; - long output_long3; - long output_long4; - - // String output parameter. - std::wstring output_string; - - // Return code, either S_OK (true) or S_FALSE (false). WebKit MSAA error - // return codes (E_POINTER, E_INVALIDARG, E_FAIL, E_NOTIMPL) must be handled - // on the browser side by input validation. - bool return_code; -}; - // The first parameter for the ViewHostMsg_ImeUpdateStatus message. enum ViewHostMsg_ImeControl { IME_DISABLE = 0, @@ -610,10 +488,9 @@ struct ParamTraits<WebInputEvent::Type> { } }; -// Traits for ViewMsg_Accessibility_In_Params structure to pack/unpack. template <> -struct ParamTraits<ViewMsg_Accessibility_In_Params> { - typedef ViewMsg_Accessibility_In_Params param_type; +struct ParamTraits<AccessibilityInParams> { + typedef AccessibilityInParams param_type; static void Write(Message* m, const param_type& p) { WriteParam(m, p.iaccessible_id); WriteParam(m, p.iaccessible_function_id); @@ -644,10 +521,9 @@ struct ParamTraits<ViewMsg_Accessibility_In_Params> { } }; -// Traits for ViewHostMsg_Accessibility_Out_Params structure to pack/unpack. template <> -struct ParamTraits<ViewHostMsg_Accessibility_Out_Params> { - typedef ViewHostMsg_Accessibility_Out_Params param_type; +struct ParamTraits<AccessibilityOutParams> { + typedef AccessibilityOutParams param_type; static void Write(Message* m, const param_type& p) { WriteParam(m, p.iaccessible_id); WriteParam(m, p.output_variant_lval); @@ -905,10 +781,9 @@ struct ParamTraits<ViewHostMsg_FrameNavigate_Params> { } }; -// Traits for ViewHostMsg_ContextMenu_Params structure to pack/unpack. template <> -struct ParamTraits<ViewHostMsg_ContextMenu_Params> { - typedef ViewHostMsg_ContextMenu_Params param_type; +struct ParamTraits<ContextMenuParams> { + typedef ContextMenuParams param_type; static void Write(Message* m, const param_type& p) { WriteParam(m, p.node); WriteParam(m, p.x); @@ -941,7 +816,7 @@ struct ParamTraits<ViewHostMsg_ContextMenu_Params> { ReadParam(m, iter, &p->security_info); } static void Log(const param_type& p, std::wstring* l) { - l->append(L"<ViewHostMsg_ContextMenu_Params>"); + l->append(L"<ContextMenuParams>"); } }; @@ -1423,10 +1298,9 @@ struct ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo> { } }; -// Traits for ViewMsg_Resource_ResponseHead template <> -struct ParamTraits<ViewMsg_Resource_ResponseHead> { - typedef ViewMsg_Resource_ResponseHead param_type; +struct ParamTraits<ResourceResponseHead> { + typedef ResourceResponseHead param_type; static void Write(Message* m, const param_type& p) { ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Write(m, p); WriteParam(m, p.status); @@ -1444,18 +1318,17 @@ struct ParamTraits<ViewMsg_Resource_ResponseHead> { } }; -// Traits for ViewHostMsg_Resource_SyncLoad_Response template <> -struct ParamTraits<ViewHostMsg_SyncLoad_Result> { - typedef ViewHostMsg_SyncLoad_Result param_type; +struct ParamTraits<SyncLoadResult> { + typedef SyncLoadResult param_type; static void Write(Message* m, const param_type& p) { - ParamTraits<ViewMsg_Resource_ResponseHead>::Write(m, p); + ParamTraits<ResourceResponseHead>::Write(m, p); WriteParam(m, p.final_url); WriteParam(m, p.data); } static bool Read(const Message* m, void** iter, param_type* r) { return - ParamTraits<ViewMsg_Resource_ResponseHead>::Read(m, iter, r) && + ParamTraits<ResourceResponseHead>::Read(m, iter, r) && ReadParam(m, iter, &r->final_url) && ReadParam(m, iter, &r->data); } diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 30c23ba..e6b401e 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -18,7 +18,6 @@ #include "chrome/common/ipc_message_macros.h" #include "skia/include/SkBitmap.h" #include "webkit/glue/console_message_level.h" -#include "webkit/glue/context_node_types.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/screen_info.h" #include "webkit/glue/webcursor.h" @@ -170,7 +169,7 @@ IPC_BEGIN_MESSAGES(View) // Sent when the headers are available for a resource request. IPC_MESSAGE_ROUTED2(ViewMsg_Resource_ReceivedResponse, int /* request_id */, - ViewMsg_Resource_ResponseHead) + ResourceResponseHead) // Sent as upload progress is being made IPC_MESSAGE_ROUTED3(ViewMsg_Resource_UploadProgress, @@ -382,9 +381,9 @@ IPC_BEGIN_MESSAGES(View) // Retreive information from the MSAA DOM subtree, for accessibility purposes. IPC_SYNC_MESSAGE_ROUTED1_1(ViewMsg_GetAccessibilityInfo, - ViewMsg_Accessibility_In_Params + AccessibilityInParams /* input parameters */, - ViewHostMsg_Accessibility_Out_Params + AccessibilityOutParams /* output parameters */) // Requests the renderer to clear cashed accessibility information. Takes an @@ -662,7 +661,7 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_SyncLoad, int /* request_id */, ViewHostMsg_Resource_Request, - ViewHostMsg_SyncLoad_Result) + SyncLoadResult) // Used to set a cookie. The cookie is set asynchronously, but will be // available to a subsequent ViewHostMsg_GetCookies request. @@ -751,7 +750,7 @@ IPC_BEGIN_MESSAGES(ViewHost) // 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, ViewHostMsg_ContextMenu_Params) + IPC_MESSAGE_ROUTED1(ViewHostMsg_ContextMenu, ContextMenuParams) // Request that the given URL be opened in the specified manner. IPC_MESSAGE_ROUTED3(ViewHostMsg_OpenURL, diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc index 822a720..7f64d32 100644 --- a/chrome/common/resource_dispatcher.cc +++ b/chrome/common/resource_dispatcher.cc @@ -210,7 +210,7 @@ void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) { request_id_ = MakeRequestID(); - ViewHostMsg_SyncLoad_Result result; + SyncLoadResult result; IPC::Message::Sender* sender = dispatcher_->message_sender(); if (sender) { @@ -303,8 +303,7 @@ void ResourceDispatcher::OnUploadProgress( } void ResourceDispatcher::OnReceivedResponse( - int request_id, - const ViewMsg_Resource_ResponseHead& response_head) { + int request_id, const ResourceResponseHead& response_head) { PendingRequestList::iterator it = pending_requests_.find(request_id); if (it == pending_requests_.end()) { // This might happen for kill()ed requests on the webkit end, so perhaps it diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h index 13372a9..32e054b 100644 --- a/chrome/common/resource_dispatcher.h +++ b/chrome/common/resource_dispatcher.h @@ -10,11 +10,15 @@ #include <queue> #include "base/hash_tables.h" +#include "base/shared_memory.h" #include "base/task.h" +#include "chrome/common/filter_policy.h" #include "chrome/common/ipc_channel.h" -#include "chrome/common/render_messages.h" #include "webkit/glue/resource_loader_bridge.h" +struct ResourceResponseHead; +struct ViewMsg_Resource_ResponseHead; + // Uncomment this to disable loading resources via the parent process. This // may be useful for debugging purposes. //#define USING_SIMPLE_RESOURCE_LOADER_BRIDGE @@ -99,7 +103,7 @@ class ResourceDispatcher : public base::RefCounted<ResourceDispatcher> { // Message response handlers, called by the message handler for this process. void OnUploadProgress(int request_id, int64 position, int64 size); - void OnReceivedResponse(int request_id, const ViewMsg_Resource_ResponseHead&); + void OnReceivedResponse(int request_id, const ResourceResponseHead&); void OnReceivedRedirect(int request_id, const GURL& new_url); void OnReceivedData(int request_id, base::SharedMemoryHandle data, int data_len); diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc index bf9cc51..43628b8 100644 --- a/chrome/common/resource_dispatcher_unittest.cc +++ b/chrome/common/resource_dispatcher_unittest.cc @@ -8,6 +8,7 @@ #include "base/process.h" #include "base/ref_counted.h" #include "chrome/common/filter_policy.h" +#include "chrome/common/render_messages.h" #include "chrome/common/resource_dispatcher.h" #include "testing/gtest/include/gtest/gtest.h" @@ -93,7 +94,7 @@ class ResourceDispatcherTest : public testing::Test, EXPECT_EQ(test_page_url, request.url.spec()); // received response message - ViewMsg_Resource_ResponseHead response; + ResourceResponseHead response; std::string raw_headers(test_page_headers); std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0'); response.headers = new net::HttpResponseHeaders(raw_headers); diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc index 482a669..9343cae 100644 --- a/chrome/plugin/chrome_plugin_host.cc +++ b/chrome/plugin/chrome_plugin_host.cc @@ -16,6 +16,7 @@ #include "chrome/plugin/plugin_thread.h" #include "chrome/plugin/webplugin_proxy.h" #include "net/base/data_url.h" +#include "net/base/upload_data.h" #include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/resource_type.h" diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index e2416f0..c7bb53d 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/message_loop.h" +#include "base/string_util.h" #include "base/system_monitor.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/plugin/plugin_process.h b/chrome/plugin/plugin_process.h index ca80722..b315bce 100644 --- a/chrome/plugin/plugin_process.h +++ b/chrome/plugin/plugin_process.h @@ -5,6 +5,7 @@ #ifndef CHROME_PLUGIN_PLUGIN_PROCESS_H_ #define CHROME_PLUGIN_PLUGIN_PROCESS_H_ +#include "base/file_path.h" #include "chrome/common/child_process.h" #include "chrome/plugin/plugin_thread.h" diff --git a/chrome/renderer/chrome_plugin_host.cc b/chrome/renderer/chrome_plugin_host.cc index ae7dd86..27bdcb2 100644 --- a/chrome/renderer/chrome_plugin_host.cc +++ b/chrome/renderer/chrome_plugin_host.cc @@ -9,6 +9,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/chrome_plugin_util.h" +#include "chrome/common/render_messages.h" #include "chrome/common/resource_dispatcher.h" #include "chrome/renderer/render_view.h" #include "net/base/data_url.h" diff --git a/chrome/renderer/debug_message_handler.cc b/chrome/renderer/debug_message_handler.cc index 78ba519..bfb1e02 100644 --- a/chrome/renderer/debug_message_handler.cc +++ b/chrome/renderer/debug_message_handler.cc @@ -3,6 +3,8 @@ // found in the LICENSE file. #include "chrome/renderer/debug_message_handler.h" + +#include "chrome/common/render_messages.h" #include "chrome/renderer/render_view.h" //////////////////////////////////////// diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 5b0dbcb..434f9e2 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -12,6 +12,7 @@ #include "base/shared_memory.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/ipc_logging.h" +#include "chrome/common/render_messages.h" #include "chrome/common/notification_service.h" // TODO(port) #if defined(OS_WIN) diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 8026718..ca54f01 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -21,6 +21,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" #include "chrome/common/page_zoom.h" +#include "chrome/common/render_messages.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/thumbnail_score.h" #include "chrome/renderer/about_handler.h" @@ -2012,7 +2013,7 @@ void RenderView::ShowContextMenu(WebView* webview, const std::wstring& misspelled_word, int edit_flags, const std::string& security_info) { - ViewHostMsg_ContextMenu_Params params; + ContextMenuParams params; params.node = node; params.x = x; params.y = y; @@ -2667,8 +2668,8 @@ void RenderView::OnUpdateBackForwardListCount(int back_list_count, } void RenderView::OnGetAccessibilityInfo( - const ViewMsg_Accessibility_In_Params& in_params, - ViewHostMsg_Accessibility_Out_Params* out_params) { + const AccessibilityInParams& in_params, + AccessibilityOutParams* out_params) { #if defined(OS_WIN) if (!glue_accessibility_.get()) glue_accessibility_.reset(new GlueAccessibility()); diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index ffd551e..83047b9 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -29,7 +29,10 @@ #include "testing/gtest/include/gtest/gtest_prod.h" #include "webkit/glue/console_message_level.h" #include "webkit/glue/dom_serializer_delegate.h" +#include "webkit/glue/find_in_page_request.h" +#include "webkit/glue/form_data.h" #include "webkit/glue/glue_accessibility.h" +#include "webkit/glue/password_form_dom_manager.h" #include "webkit/glue/webview_delegate.h" #include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview.h" @@ -45,11 +48,18 @@ class DebugMessageHandler; class GURL; class RenderThread; class SkBitmap; -struct ThumbnailScore; class WebError; class WebFrame; class WebPluginDelegate; class WebPluginDelegateProxy; +struct AccessibilityInParams; +struct AccessibilityOutParams; +struct ThumbnailScore; +struct ViewMsg_Navigate_Params; +struct ViewMsg_PrintPage_Params; +struct ViewMsg_PrintPages_Params; +struct ViewMsg_Print_Params; +struct ViewMsg_UploadFile_Params; namespace base { class WaitableEvent; @@ -469,8 +479,8 @@ class RenderView : public RenderWidget, void OnEnableViewSourceMode(); void OnUpdateBackForwardListCount(int back_list_count, int forward_list_count); - void OnGetAccessibilityInfo(const ViewMsg_Accessibility_In_Params& in_params, - ViewHostMsg_Accessibility_Out_Params* out_params); + void OnGetAccessibilityInfo(const AccessibilityInParams& in_params, + AccessibilityOutParams* out_params); void OnClearAccessibilityInfo(int iaccessible_id, bool clear_all); // Checks if the RenderView should close, runs the beforeunload handler and diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index 0a87528..fd8b2df 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" +#include "chrome/common/render_messages.h" #include "chrome/renderer/mock_render_process.h" #include "chrome/renderer/mock_render_thread.h" #include "chrome/renderer/render_view.h" diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 4e0af7b..966f716 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -18,6 +18,7 @@ #include "chrome/renderer/net/render_dns_master.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/resource_bundle.h" +#include "chrome/common/render_messages.h" #include "chrome/plugin/npobject_util.h" #include "chrome/renderer/render_view.h" #include "chrome/renderer/visitedlink_slave.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 94185d8..155c19a 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -19,6 +19,7 @@ #include "chrome/common/gfx/emf.h" #include "chrome/common/l10n_util.h" #include "chrome/common/plugin_messages.h" +#include "chrome/common/render_messages.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/plugin/npobject_proxy.h" diff --git a/chrome/test/test_tab_contents.cc b/chrome/test/test_tab_contents.cc index 768b9e7..1ee16fb 100644 --- a/chrome/test/test_tab_contents.cc +++ b/chrome/test/test_tab_contents.cc @@ -5,6 +5,7 @@ #include "chrome/test/test_tab_contents.h" #include "chrome/browser/tab_contents/navigation_entry.h" +#include "chrome/common/render_messages.h" // static SiteInstance* TestTabContents::site_instance_ = NULL; |