diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 22:36:26 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 22:36:26 +0000 |
commit | 15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00 (patch) | |
tree | 5fbd5eb8932485758f17be2060bd2d3179fed704 /chrome/browser/renderer_host | |
parent | b665bf2b7418b0820a677d11d50da12b5b800351 (diff) | |
download | chromium_src-15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00.zip chromium_src-15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00.tar.gz chromium_src-15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00.tar.bz2 |
Plumbs through window.chrome.setSuggestResult. It's currently hidden behind a flag.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3312017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
4 files changed, 16 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index f7a9b17..ce76ff9 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -579,6 +579,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kPrelaunchGpuProcess, switches::kEnableAcceleratedDecoding, switches::kEnableFileSystem, + switches::kEnableMatchPreview }; renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, arraysize(kSwitchNames)); diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 9d06007..998d87c 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -855,6 +855,7 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnMsgFocusedNodeChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_SetDisplayingPDFContent, OnSetDisplayingPDFContent) + IPC_MESSAGE_HANDLER(ViewHostMsg_SetSuggestResult, OnSetSuggestResult) // Have the super handle all other messages. IPC_MESSAGE_UNHANDLED(RenderWidgetHost::OnMessageReceived(msg)) IPC_END_MESSAGE_MAP_EX() @@ -2071,3 +2072,12 @@ void RenderViewHost::OnWebDatabaseAccessed(const GURL& url, void RenderViewHost::OnSetDisplayingPDFContent() { delegate_->SetDisplayingPDFContent(); } + +void RenderViewHost::OnSetSuggestResult(int32 page_id, + const std::string& result) { + RenderViewHostDelegate::BrowserIntegration* integration_delegate = + delegate_->GetBrowserIntegrationDelegate(); + if (!integration_delegate) + return; + integration_delegate->OnSetSuggestResult(page_id, result); +} diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index c971918..deccb72 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -677,6 +677,7 @@ class RenderViewHost : public RenderWidgetHost { unsigned long estimated_size, bool blocked_by_policy); void OnSetDisplayingPDFContent(); + void OnSetSuggestResult(int32 page_id, const std::string& result); private: friend class TestRenderViewHost; diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index 27f9dc8..ebe088e 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -281,6 +281,10 @@ class RenderViewHostDelegate { const std::string& translated_lang, TranslateErrors::Type error_type) = 0; + // Notification that the page has a suggest result. + virtual void OnSetSuggestResult(int32 page_id, + const std::string& result) = 0; + protected: virtual ~BrowserIntegration() {} }; |