diff options
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/plugin_process_host.cc | 1 | ||||
-rw-r--r-- | content/browser/renderer_host/render_view_host_delegate.cc | 1 | ||||
-rw-r--r-- | content/browser/renderer_host/render_widget_helper.cc | 1 | ||||
-rw-r--r-- | content/browser/renderer_host/resource_dispatcher_host_unittest.cc | 1 | ||||
-rw-r--r-- | content/browser/tab_contents/navigation_controller_unittest.cc | 1 | ||||
-rw-r--r-- | content/renderer/pepper_plugin_delegate_impl.cc | 1 | ||||
-rw-r--r-- | content/renderer/render_view.cc | 15 | ||||
-rw-r--r-- | content/renderer/render_view.h | 13 | ||||
-rw-r--r-- | content/renderer/render_view_browsertest.cc | 1 | ||||
-rw-r--r-- | content/renderer/render_widget.cc | 1 |
10 files changed, 13 insertions, 23 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index e9fdf56..e6f245d3 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -29,7 +29,6 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" diff --git a/content/browser/renderer_host/render_view_host_delegate.cc b/content/browser/renderer_host/render_view_host_delegate.cc index 72b12b7..2d56531 100644 --- a/content/browser/renderer_host/render_view_host_delegate.cc +++ b/content/browser/renderer_host/render_view_host_delegate.cc @@ -6,7 +6,6 @@ #include "base/memory/singleton.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "content/common/renderer_preferences.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc index 421af33..161bf88 100644 --- a/content/browser/renderer_host/render_widget_helper.cc +++ b/content/browser/renderer_host/render_widget_helper.cc @@ -6,7 +6,6 @@ #include "base/eintr_wrapper.h" #include "base/threading/thread.h" -#include "chrome/common/render_messages_params.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc index 5354cfd..01e55e3 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc @@ -8,7 +8,6 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc index 9de7247..6a2ad65 100644 --- a/content/browser/tab_contents/navigation_controller_unittest.cc +++ b/content/browser/tab_contents/navigation_controller_unittest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/sessions/session_service_test_helper.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/test/test_notification_tracker.h" #include "chrome/test/testing_profile.h" #include "content/browser/renderer_host/test_render_view_host.h" diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 91efe42..28bf23e 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -16,7 +16,6 @@ #include "base/time.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/renderer/render_thread.h" #include "content/common/audio_messages.h" #include "content/common/child_process_messages.h" diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 07acef3..04fd392 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -1899,7 +1899,7 @@ bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) { void RenderView::AddGURLSearchProvider( const GURL& osd_url, - const ViewHostMsg_PageHasOSDD_Type& provider_type) { + search_provider::OSDDType provider_type) { if (!osd_url.is_empty()) Send(new ViewHostMsg_PageHasOSDD(routing_id_, page_id_, osd_url, provider_type)); @@ -1911,23 +1911,22 @@ void RenderView::OnAllowScriptToClose(bool script_can_close) { void RenderView::AddSearchProvider( const std::string& url, - const ViewHostMsg_PageHasOSDD_Type& provider_type) { - if (provider_type.type == - ViewHostMsg_PageHasOSDD_Type::EXPLICIT_DEFAULT_PROVIDER && + search_provider::OSDDType provider_type) { + if (provider_type == search_provider::EXPLICIT_DEFAULT_PROVIDER && !webview()->mainFrame()->isProcessingUserGesture()) return; AddGURLSearchProvider(GURL(url), provider_type); } -ViewHostMsg_GetSearchProviderInstallState_Params +search_provider::InstallState RenderView::GetSearchProviderInstallState(WebFrame* frame, const std::string& url) { GURL inquiry_url = GURL(url); if (inquiry_url.is_empty()) - return ViewHostMsg_GetSearchProviderInstallState_Params::Denied(); + return search_provider::DENIED; - ViewHostMsg_GetSearchProviderInstallState_Params install; + search_provider::InstallState install; Send(new ViewHostMsg_GetSearchProviderInstallState(routing_id_, frame->url(), inquiry_url, @@ -2116,7 +2115,7 @@ void RenderView::didStopLoading() { Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, favicon_url)); AddGURLSearchProvider(webview()->mainFrame()->openSearchDescriptionURL(), - ViewHostMsg_PageHasOSDD_Type::Autodetected()); + search_provider::AUTODETECTED_PROVIDER); Send(new ViewHostMsg_DidStopLoading(routing_id_)); diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h index 05c64c2..0e4f6f6 100644 --- a/content/renderer/render_view.h +++ b/content/renderer/render_view.h @@ -22,6 +22,7 @@ #include "base/timer.h" #include "build/build_config.h" #include "chrome/common/content_settings.h" +#include "chrome/common/search_provider.h" #include "chrome/common/view_types.h" #include "chrome/renderer/page_load_histograms.h" #include "content/renderer/renderer_webcookiejar_impl.h" @@ -82,8 +83,6 @@ struct ContextMenuMediaParams; struct ExtensionMsg_ExecuteCode_Params; struct PP_Flash_NetAddress; struct ThumbnailScore; -struct ViewHostMsg_GetSearchProviderInstallState_Params; -struct ViewHostMsg_PageHasOSDD_Type; struct ViewHostMsg_RunFileChooser_Params; struct ViewMsg_ClosePage_Params; struct ViewMsg_Navigate_Params; @@ -263,12 +262,12 @@ class RenderView : public RenderWidget, // Called from JavaScript window.external.AddSearchProvider() to add a // keyword for a provider described in the given OpenSearch document. void AddSearchProvider(const std::string& url, - const ViewHostMsg_PageHasOSDD_Type& provider_type); + search_provider::OSDDType provider_type); // Returns the install state for the given search provider url. - ViewHostMsg_GetSearchProviderInstallState_Params - GetSearchProviderInstallState(WebKit::WebFrame* frame, - const std::string& url); + search_provider::InstallState GetSearchProviderInstallState( + WebKit::WebFrame* frame, + const std::string& url); // Evaluates a string of JavaScript in a particular frame. void EvaluateScript(const string16& frame_xpath, @@ -772,7 +771,7 @@ class RenderView : public RenderWidget, // Adds search provider from the given OpenSearch description URL as a // keyword search. void AddGURLSearchProvider(const GURL& osd_url, - const ViewHostMsg_PageHasOSDD_Type& provider_type); + search_provider::OSDDType provider_type); // Send queued accessibility notifications from the renderer to the browser. void SendPendingAccessibilityNotifications(); diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 6c7b1fc..ae23dc4 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/common/autofill_messages.h" #include "chrome/common/content_settings.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/renderer/autofill/autofill_agent.h" #include "chrome/renderer/print_web_view_helper.h" #include "chrome/test/render_view_test.h" diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 79da43d4..3f3fc75 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -12,7 +12,6 @@ #include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/renderer/render_process.h" #include "chrome/renderer/render_thread.h" #include "content/common/view_messages.h" |