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

Side by Side Diff: content/public/renderer/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
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 CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
6 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ 6 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/string16.h" 11 #include "base/string16.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "ipc/ipc_message.h" 13 #include "ipc/ipc_message.h"
14 #include "content/public/common/content_client.h" 14 #include "content/public/common/content_client.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityStat e.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityStat e.h"
16 16
17 class FilePath;
18 class GURL; 17 class GURL;
19 class SkBitmap; 18 class SkBitmap;
20 19
21 namespace WebKit { 20 namespace WebKit {
22 class WebAudioSourceProvider; 21 class WebAudioSourceProvider;
23 class WebFrame; 22 class WebFrame;
24 class WebMediaPlayerClient; 23 class WebMediaPlayerClient;
25 class WebPlugin; 24 class WebPlugin;
26 class WebURLRequest; 25 class WebURLRequest;
27 struct WebPluginParams; 26 struct WebPluginParams;
28 struct WebURLError; 27 struct WebURLError;
29 } 28 }
30 29
31 namespace webkit { 30 namespace webkit {
32 namespace ppapi { 31 namespace ppapi {
33 class PpapiInterfaceFactoryManager; 32 class PpapiInterfaceFactoryManager;
34 } 33 }
35 struct WebPluginInfo;
36 } 34 }
37 35
38 namespace media { 36 namespace media {
39 class FilterCollection; 37 class FilterCollection;
40 class MediaLog; 38 class MediaLog;
41 class MessageLoopFactory; 39 class MessageLoopFactory;
42 } 40 }
43 41
44 namespace webkit_media { 42 namespace webkit_media {
45 class MediaStreamClient; 43 class MediaStreamClient;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 76
79 // Allows the embedder to override creating a plugin. If it returns true, then 77 // Allows the embedder to override creating a plugin. If it returns true, then
80 // |plugin| will contain the created plugin, although it could be NULL. If it 78 // |plugin| will contain the created plugin, although it could be NULL. If it
81 // returns false, the content layer will create the plugin. 79 // returns false, the content layer will create the plugin.
82 virtual bool OverrideCreatePlugin( 80 virtual bool OverrideCreatePlugin(
83 RenderView* render_view, 81 RenderView* render_view,
84 WebKit::WebFrame* frame, 82 WebKit::WebFrame* frame,
85 const WebKit::WebPluginParams& params, 83 const WebKit::WebPluginParams& params,
86 WebKit::WebPlugin** plugin) = 0; 84 WebKit::WebPlugin** plugin) = 0;
87 85
88 // Creates a replacement plug-in that is shown when the plug-in at |file_path|
89 // couldn't be loaded. This allows the embedder to show a custom placeholder.
90 virtual WebKit::WebPlugin* CreatePluginReplacement(
91 RenderView* render_view,
92 const FilePath& plugin_path) = 0;
93
94 // Returns true if the embedder has an error page to show for the given http 86 // Returns true if the embedder has an error page to show for the given http
95 // status code. If so |error_domain| should be set to according to WebURLError 87 // status code. If so |error_domain| should be set to according to WebURLError
96 // and the embedder's GetNavigationErrorHtml will be called afterwards to get 88 // and the embedder's GetNavigationErrorHtml will be called afterwards to get
97 // the error html. 89 // the error html.
98 virtual bool HasErrorPage(int http_status_code, 90 virtual bool HasErrorPage(int http_status_code,
99 std::string* error_domain) = 0; 91 std::string* error_domain) = 0;
100 92
101 // Returns the information to display when a navigation error occurs. 93 // Returns the information to display when a navigation error occurs.
102 // If |error_html| is not null then it may be set to a HTML page containing 94 // If |error_html| is not null then it may be set to a HTML page containing
103 // the details of the error and maybe links to more info. 95 // the details of the error and maybe links to more info.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 const GURL& first_party_for_cookies, 172 const GURL& first_party_for_cookies,
181 const std::string& value) = 0; 173 const std::string& value) = 0;
182 174
183 virtual void RegisterPPAPIInterfaceFactories( 175 virtual void RegisterPPAPIInterfaceFactories(
184 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) = 0; 176 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) = 0;
185 }; 177 };
186 178
187 } // namespace content 179 } // namespace content
188 180
189 #endif // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ 181 #endif // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/renderer/plugins/plugin_placeholder.cc ('k') | content/renderer/mock_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698