| Index: chrome/renderer/chrome_content_renderer_client.h
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
|
| index 599c5e8b584c83ed76148ecbd3d043dfe230b49d..49eef61ed3d59139405b43b9ed443a52841cd8b6 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.h
|
| +++ b/chrome/renderer/chrome_content_renderer_client.h
|
| @@ -21,6 +21,7 @@ class ChromeRenderProcessObserver;
|
| class ExtensionSet;
|
| class PrescientNetworkingDispatcher;
|
| class RendererNetPredictor;
|
| +class SearchBouncer;
|
| #if defined(ENABLE_SPELLCHECK)
|
| class SpellCheck;
|
| class SpellCheckProvider;
|
| @@ -81,6 +82,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| const base::FilePath& plugin_path) OVERRIDE;
|
| virtual bool HasErrorPage(int http_status_code,
|
| std::string* error_domain) OVERRIDE;
|
| + virtual bool ShouldSuppressErrorPage(const GURL& url) OVERRIDE;
|
| virtual void GetNavigationErrorStrings(
|
| WebKit::WebFrame* frame,
|
| const WebKit::WebURLRequest& failed_request,
|
| @@ -172,6 +174,8 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
|
| + FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest,
|
| + ShouldSuppressErrorPage);
|
|
|
| // Gets extension by the given origin, regardless of whether the extension
|
| // is active in the current process.
|
| @@ -209,6 +213,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| #if defined(ENABLE_WEBRTC)
|
| scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_;
|
| #endif
|
| + scoped_ptr<SearchBouncer> search_bouncer_;
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| std::set<std::string> allowed_file_handle_origins_;
|
|
|