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

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

Issue 673663004: Android: Do not build any extensions code except for extensions_constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@zoom_controller
Patch Set: fix merge conflict Created 6 years, 1 month 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/common/BUILD.gn ('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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 bool CrossesExtensionExtents(blink::WebFrame* frame, 184 bool CrossesExtensionExtents(blink::WebFrame* frame,
185 const GURL& new_url, 185 const GURL& new_url,
186 const extensions::ExtensionSet& extensions, 186 const extensions::ExtensionSet& extensions,
187 bool is_extension_url, 187 bool is_extension_url,
188 bool is_initial_navigation); 188 bool is_initial_navigation);
189 #endif 189 #endif
190 190
191 static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type, 191 static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
192 const content::WebPluginInfo& plugin); 192 const content::WebPluginInfo& plugin);
193 193
194 #if !defined(DISABLE_NACL)
194 // Determines if a NaCl app is allowed, and modifies params to pass the app's 195 // Determines if a NaCl app is allowed, and modifies params to pass the app's
195 // permissions to the trusted NaCl plugin. 196 // permissions to the trusted NaCl plugin.
196 static bool IsNaClAllowed(const GURL& manifest_url, 197 static bool IsNaClAllowed(const GURL& manifest_url,
197 const GURL& app_url, 198 const GURL& app_url,
198 bool is_nacl_unrestricted, 199 bool is_nacl_unrestricted,
199 const extensions::Extension* extension, 200 const extensions::Extension* extension,
200 blink::WebPluginParams* params); 201 blink::WebPluginParams* params);
202 #endif
201 203
202 scoped_ptr<ChromeRenderProcessObserver> chrome_observer_; 204 scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
203 scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_; 205 scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
204 206
205 // TODO(thestig): Extract into a separate file if possible. Cleanup 207 // TODO(thestig): Extract into a separate file if possible. Cleanup
206 // ENABLE_EXTENSIONS ifdefs in the .cc file as well. 208 // ENABLE_EXTENSIONS ifdefs in the .cc file as well.
207 #if defined(ENABLE_EXTENSIONS) 209 #if defined(ENABLE_EXTENSIONS)
208 scoped_ptr<ChromeExtensionsDispatcherDelegate> extension_dispatcher_delegate_; 210 scoped_ptr<ChromeExtensionsDispatcherDelegate> extension_dispatcher_delegate_;
209 scoped_ptr<extensions::Dispatcher> extension_dispatcher_; 211 scoped_ptr<extensions::Dispatcher> extension_dispatcher_;
210 scoped_ptr<extensions::RendererPermissionsPolicyDelegate> 212 scoped_ptr<extensions::RendererPermissionsPolicyDelegate>
(...skipping 17 matching lines...) Expand all
228 #if defined(ENABLE_FULL_PRINTING) 230 #if defined(ENABLE_FULL_PRINTING)
229 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; 231 scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
230 #endif 232 #endif
231 #if defined(ENABLE_PLUGINS) 233 #if defined(ENABLE_PLUGINS)
232 std::set<std::string> allowed_compositor_origins_; 234 std::set<std::string> allowed_compositor_origins_;
233 std::set<std::string> allowed_video_decode_origins_; 235 std::set<std::string> allowed_video_decode_origins_;
234 #endif 236 #endif
235 }; 237 };
236 238
237 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 239 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/common/BUILD.gn ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698