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

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

Issue 2855123003: Remove rendundant WebLocalFrame parameter in various plugin code. (Closed)
Patch Set: Fix Android Created 3 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
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 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 public: 104 public:
105 ChromeContentRendererClient(); 105 ChromeContentRendererClient();
106 ~ChromeContentRendererClient() override; 106 ~ChromeContentRendererClient() override;
107 107
108 void RenderThreadStarted() override; 108 void RenderThreadStarted() override;
109 void RenderFrameCreated(content::RenderFrame* render_frame) override; 109 void RenderFrameCreated(content::RenderFrame* render_frame) override;
110 void RenderViewCreated(content::RenderView* render_view) override; 110 void RenderViewCreated(content::RenderView* render_view) override;
111 SkBitmap* GetSadPluginBitmap() override; 111 SkBitmap* GetSadPluginBitmap() override;
112 SkBitmap* GetSadWebViewBitmap() override; 112 SkBitmap* GetSadWebViewBitmap() override;
113 bool OverrideCreatePlugin(content::RenderFrame* render_frame, 113 bool OverrideCreatePlugin(content::RenderFrame* render_frame,
114 blink::WebLocalFrame* frame,
115 const blink::WebPluginParams& params, 114 const blink::WebPluginParams& params,
116 blink::WebPlugin** plugin) override; 115 blink::WebPlugin** plugin) override;
117 blink::WebPlugin* CreatePluginReplacement( 116 blink::WebPlugin* CreatePluginReplacement(
118 content::RenderFrame* render_frame, 117 content::RenderFrame* render_frame,
119 const base::FilePath& plugin_path) override; 118 const base::FilePath& plugin_path) override;
120 bool HasErrorPage(int http_status_code, std::string* error_domain) override; 119 bool HasErrorPage(int http_status_code, std::string* error_domain) override;
121 bool ShouldSuppressErrorPage(content::RenderFrame* render_frame, 120 bool ShouldSuppressErrorPage(content::RenderFrame* render_frame,
122 const GURL& url) override; 121 const GURL& url) override;
123 void GetNavigationErrorStrings(content::RenderFrame* render_frame, 122 void GetNavigationErrorStrings(content::RenderFrame* render_frame,
124 const blink::WebURLRequest& failed_request, 123 const blink::WebURLRequest& failed_request,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 194
196 #if BUILDFLAG(ENABLE_SPELLCHECK) 195 #if BUILDFLAG(ENABLE_SPELLCHECK)
197 // Sets a new |spellcheck|. Used for testing only. 196 // Sets a new |spellcheck|. Used for testing only.
198 // Takes ownership of |spellcheck|. 197 // Takes ownership of |spellcheck|.
199 void SetSpellcheck(SpellCheck* spellcheck); 198 void SetSpellcheck(SpellCheck* spellcheck);
200 #endif 199 #endif
201 200
202 #if BUILDFLAG(ENABLE_PLUGINS) 201 #if BUILDFLAG(ENABLE_PLUGINS)
203 static blink::WebPlugin* CreatePlugin( 202 static blink::WebPlugin* CreatePlugin(
204 content::RenderFrame* render_frame, 203 content::RenderFrame* render_frame,
205 blink::WebLocalFrame* frame,
206 const blink::WebPluginParams& params, 204 const blink::WebPluginParams& params,
207 const ChromeViewHostMsg_GetPluginInfo_Output& output); 205 const ChromeViewHostMsg_GetPluginInfo_Output& output);
208 #endif 206 #endif
209 207
210 #if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS) 208 #if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS)
211 static bool IsExtensionOrSharedModuleWhitelisted( 209 static bool IsExtensionOrSharedModuleWhitelisted(
212 const GURL& url, const std::set<std::string>& whitelist); 210 const GURL& url, const std::set<std::string>& whitelist);
213 #endif 211 #endif
214 212
215 private: 213 private:
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 // Observes module load and unload events and notifies the ModuleDatabase in 268 // Observes module load and unload events and notifies the ModuleDatabase in
271 // the browser process. 269 // the browser process.
272 std::unique_ptr<ModuleWatcher> module_watcher_; 270 std::unique_ptr<ModuleWatcher> module_watcher_;
273 mojom::ModuleEventSinkPtr module_event_sink_; 271 mojom::ModuleEventSinkPtr module_event_sink_;
274 #endif 272 #endif
275 273
276 DISALLOW_COPY_AND_ASSIGN(ChromeContentRendererClient); 274 DISALLOW_COPY_AND_ASSIGN(ChromeContentRendererClient);
277 }; 275 };
278 276
279 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 277 #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') | third_party/WebKit/public/web/WebFrameClient.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698