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

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

Issue 1126073003: Plugin Placeholders: Refactor for platforms that don't support plugins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: The version that was reverted. Created 5 years, 6 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
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | 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')
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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 extensions::Dispatcher* extension_dispatcher); 161 extensions::Dispatcher* extension_dispatcher);
162 extensions::Dispatcher* GetExtensionDispatcherForTest(); 162 extensions::Dispatcher* GetExtensionDispatcherForTest();
163 #endif 163 #endif
164 164
165 #if defined(ENABLE_SPELLCHECK) 165 #if defined(ENABLE_SPELLCHECK)
166 // Sets a new |spellcheck|. Used for testing only. 166 // Sets a new |spellcheck|. Used for testing only.
167 // Takes ownership of |spellcheck|. 167 // Takes ownership of |spellcheck|.
168 void SetSpellcheck(SpellCheck* spellcheck); 168 void SetSpellcheck(SpellCheck* spellcheck);
169 #endif 169 #endif
170 170
171 #if defined(ENABLE_PLUGINS)
171 static blink::WebPlugin* CreatePlugin( 172 static blink::WebPlugin* CreatePlugin(
172 content::RenderFrame* render_frame, 173 content::RenderFrame* render_frame,
173 blink::WebLocalFrame* frame, 174 blink::WebLocalFrame* frame,
174 const blink::WebPluginParams& params, 175 const blink::WebPluginParams& params,
175 const ChromeViewHostMsg_GetPluginInfo_Output& output); 176 const ChromeViewHostMsg_GetPluginInfo_Output& output);
177 #endif
176 178
177 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 179 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
178 static bool IsExtensionOrSharedModuleWhitelisted( 180 static bool IsExtensionOrSharedModuleWhitelisted(
179 const GURL& url, const std::set<std::string>& whitelist); 181 const GURL& url, const std::set<std::string>& whitelist);
180 #endif 182 #endif
181 183
182 static bool WasWebRequestUsedBySomeExtensions(); 184 static bool WasWebRequestUsedBySomeExtensions();
183 185
184 private: 186 private:
185 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); 187 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 #if defined(ENABLE_PRINT_PREVIEW) 245 #if defined(ENABLE_PRINT_PREVIEW)
244 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; 246 scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
245 #endif 247 #endif
246 #if defined(ENABLE_PLUGINS) 248 #if defined(ENABLE_PLUGINS)
247 std::set<std::string> allowed_camera_device_origins_; 249 std::set<std::string> allowed_camera_device_origins_;
248 std::set<std::string> allowed_compositor_origins_; 250 std::set<std::string> allowed_compositor_origins_;
249 #endif 251 #endif
250 }; 252 };
251 253
252 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 254 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698