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

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

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | content/app/content_main_runner.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 #include "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 // The password_autocomplete_manager takes the first shot at processing the 294 // The password_autocomplete_manager takes the first shot at processing the
295 // notification and can stop the propagation. 295 // notification and can stop the propagation.
296 page_click_tracker->AddListener(password_autofill_manager); 296 page_click_tracker->AddListener(password_autofill_manager);
297 page_click_tracker->AddListener(autofill_agent); 297 page_click_tracker->AddListener(autofill_agent);
298 298
299 TranslateHelper* translate = new TranslateHelper(render_view); 299 TranslateHelper* translate = new TranslateHelper(render_view);
300 new ChromeRenderViewObserver( 300 new ChromeRenderViewObserver(
301 render_view, content_settings, chrome_observer_.get(), 301 render_view, content_settings, chrome_observer_.get(),
302 extension_dispatcher_.get(), translate); 302 extension_dispatcher_.get(), translate);
303 303
304 #if defined(ENABLE_PLUGINS)
304 new PepperHelper(render_view); 305 new PepperHelper(render_view);
306 #endif
307
305 // FaviconHelper will delete itself when render_view is destroyed. 308 // FaviconHelper will delete itself when render_view is destroyed.
306 new FaviconHelper(render_view); 309 new FaviconHelper(render_view);
307 // Used only for testing/automation. 310 // Used only for testing/automation.
308 if (CommandLine::ForCurrentProcess()->HasSwitch( 311 if (CommandLine::ForCurrentProcess()->HasSwitch(
309 switches::kDomAutomationController)) { 312 switches::kDomAutomationController)) {
310 new AutomationRendererHelper(render_view); 313 new AutomationRendererHelper(render_view);
311 } 314 }
312 } 315 }
313 316
314 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) { 317 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) {
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() { 1022 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() {
1020 return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled(); 1023 return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled();
1021 } 1024 }
1022 1025
1023 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 1026 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
1024 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 1027 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
1025 } 1028 }
1026 1029
1027 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1030 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1028 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1031 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1032 #if defined(ENABLE_PLUGINS)
1029 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1033 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1034 #endif
1030 } 1035 }
1031 1036
1032 } // namespace chrome 1037 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698