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

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: Created 5 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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 extensions::Dispatcher* extension_dispatcher); 157 extensions::Dispatcher* extension_dispatcher);
158 extensions::Dispatcher* GetExtensionDispatcherForTest(); 158 extensions::Dispatcher* GetExtensionDispatcherForTest();
159 #endif 159 #endif
160 160
161 #if defined(ENABLE_SPELLCHECK) 161 #if defined(ENABLE_SPELLCHECK)
162 // Sets a new |spellcheck|. Used for testing only. 162 // Sets a new |spellcheck|. Used for testing only.
163 // Takes ownership of |spellcheck|. 163 // Takes ownership of |spellcheck|.
164 void SetSpellcheck(SpellCheck* spellcheck); 164 void SetSpellcheck(SpellCheck* spellcheck);
165 #endif 165 #endif
166 166
167 #if defined(ENABLE_PLUGINS)
167 static blink::WebPlugin* CreatePlugin( 168 static blink::WebPlugin* CreatePlugin(
168 content::RenderFrame* render_frame, 169 content::RenderFrame* render_frame,
169 blink::WebLocalFrame* frame, 170 blink::WebLocalFrame* frame,
170 const blink::WebPluginParams& params, 171 const blink::WebPluginParams& params,
171 const ChromeViewHostMsg_GetPluginInfo_Output& output); 172 const ChromeViewHostMsg_GetPluginInfo_Output& output);
173 #endif
172 174
173 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 175 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
174 static bool IsExtensionOrSharedModuleWhitelisted( 176 static bool IsExtensionOrSharedModuleWhitelisted(
175 const GURL& url, const std::set<std::string>& whitelist); 177 const GURL& url, const std::set<std::string>& whitelist);
176 #endif 178 #endif
177 179
178 static bool WasWebRequestUsedBySomeExtensions(); 180 static bool WasWebRequestUsedBySomeExtensions();
179 181
180 private: 182 private:
181 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); 183 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 #if defined(ENABLE_PRINT_PREVIEW) 241 #if defined(ENABLE_PRINT_PREVIEW)
240 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; 242 scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
241 #endif 243 #endif
242 #if defined(ENABLE_PLUGINS) 244 #if defined(ENABLE_PLUGINS)
243 std::set<std::string> allowed_camera_device_origins_; 245 std::set<std::string> allowed_camera_device_origins_;
244 std::set<std::string> allowed_compositor_origins_; 246 std::set<std::string> allowed_compositor_origins_;
245 #endif 247 #endif
246 }; 248 };
247 249
248 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 250 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698