Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 10274020: Revert 134620 - Show a replacement plug-in for loading errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 virtual void RenderThreadStarted() OVERRIDE; 51 virtual void RenderThreadStarted() OVERRIDE;
52 virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE; 52 virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
53 virtual void SetNumberOfViews(int number_of_views) OVERRIDE; 53 virtual void SetNumberOfViews(int number_of_views) OVERRIDE;
54 virtual SkBitmap* GetSadPluginBitmap() OVERRIDE; 54 virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
55 virtual std::string GetDefaultEncoding() OVERRIDE; 55 virtual std::string GetDefaultEncoding() OVERRIDE;
56 virtual bool OverrideCreatePlugin( 56 virtual bool OverrideCreatePlugin(
57 content::RenderView* render_view, 57 content::RenderView* render_view,
58 WebKit::WebFrame* frame, 58 WebKit::WebFrame* frame,
59 const WebKit::WebPluginParams& params, 59 const WebKit::WebPluginParams& params,
60 WebKit::WebPlugin** plugin) OVERRIDE; 60 WebKit::WebPlugin** plugin) OVERRIDE;
61 virtual WebKit::WebPlugin* CreatePluginReplacement(
62 content::RenderView* render_view,
63 const FilePath& plugin_path) OVERRIDE;
64 virtual bool HasErrorPage(int http_status_code, 61 virtual bool HasErrorPage(int http_status_code,
65 std::string* error_domain) OVERRIDE; 62 std::string* error_domain) OVERRIDE;
66 virtual void GetNavigationErrorStrings( 63 virtual void GetNavigationErrorStrings(
67 const WebKit::WebURLRequest& failed_request, 64 const WebKit::WebURLRequest& failed_request,
68 const WebKit::WebURLError& error, 65 const WebKit::WebURLError& error,
69 std::string* error_html, 66 std::string* error_html,
70 string16* error_description) OVERRIDE; 67 string16* error_description) OVERRIDE;
71 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer( 68 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
72 content::RenderView* render_view, 69 content::RenderView* render_view,
73 WebKit::WebFrame* frame, 70 WebKit::WebFrame* frame,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 scoped_ptr<RendererNetPredictor> net_predictor_; 162 scoped_ptr<RendererNetPredictor> net_predictor_;
166 scoped_ptr<SpellCheck> spellcheck_; 163 scoped_ptr<SpellCheck> spellcheck_;
167 scoped_ptr<VisitedLinkSlave> visited_link_slave_; 164 scoped_ptr<VisitedLinkSlave> visited_link_slave_;
168 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 165 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
169 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; 166 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
170 }; 167 };
171 168
172 } // namespace chrome 169 } // namespace chrome
173 170
174 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 171 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698