From e09ba55021ea324864cff41148a0d3ee65539963 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 5 Feb 2009 03:26:29 +0000 Subject: Finish taking out render_messages.h includes from headers. Review URL: http://codereview.chromium.org/20072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9209 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/automation/automation_provider.h | 1 + chrome/browser/browser.scons | 1 - chrome/browser/browser.vcproj | 4 --- chrome/browser/browser_accessibility.cc | 6 ++-- chrome/browser/browser_accessibility.h | 4 +-- chrome/browser/browser_accessibility_manager.cc | 6 ++-- chrome/browser/browser_accessibility_manager.h | 7 ++-- chrome/browser/chrome_plugin_host.cc | 1 + chrome/browser/history/history.cc | 1 + chrome/browser/iaccessible_function_ids.h | 38 ---------------------- chrome/browser/metrics/metrics_service.cc | 1 + chrome/browser/navigation_controller_unittest.cc | 1 + chrome/browser/printing/print_view_manager.cc | 1 + .../renderer_host/async_resource_handler.cc | 2 ++ chrome/browser/renderer_host/render_view_host.cc | 5 ++- chrome/browser/renderer_host/render_view_host.h | 6 ++-- .../renderer_host/render_view_host_delegate.h | 5 ++- .../browser/renderer_host/render_widget_helper.cc | 1 + .../renderer_host/render_widget_host_unittest.cc | 1 + .../renderer_host/render_widget_host_view_win.cc | 1 + .../renderer_host/render_widget_host_view_win.h | 3 +- chrome/browser/renderer_host/resource_handler.h | 27 +++++++++++++-- .../browser/renderer_host/sync_resource_handler.cc | 1 + .../browser/renderer_host/sync_resource_handler.h | 2 +- .../browser/renderer_host/test_render_view_host.cc | 1 + chrome/browser/resource_message_filter.cc | 5 ++- chrome/browser/resource_message_filter.h | 1 + chrome/browser/ssl/ssl_manager.h | 1 - chrome/browser/tab_contents/infobar_delegate.h | 1 + .../browser/tab_contents/navigation_controller.cc | 1 + .../browser/tab_contents/navigation_controller.h | 2 ++ .../tab_contents/render_view_context_menu.cc | 2 -- .../tab_contents/render_view_context_menu.h | 2 +- .../render_view_context_menu_controller.cc | 3 +- .../render_view_context_menu_controller.h | 8 +++-- chrome/browser/tab_contents/tab_contents.h | 1 + .../browser/tab_contents/view_source_contents.cc | 1 + .../browser/tab_contents/web_contents_view_win.cc | 5 +-- .../browser/tab_contents/web_contents_view_win.h | 3 +- 39 files changed, 77 insertions(+), 86 deletions(-) delete mode 100644 chrome/browser/iaccessible_function_ids.h (limited to 'chrome/browser') 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" > - - 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 #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 { - 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 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:: - Read(&msg, &iter, ¶ms)) + ContextMenuParams params; + if (!IPC::ParamTraits::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 #include +#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); -- cgit v1.1