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

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

Issue 290553004: PPAPI: Refactor MessageChannel to prep for sync postMessae (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move NaClHelper in to nacl namespace Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | components/nacl.gyp » ('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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 #include "third_party/WebKit/public/web/WebPluginContainer.h" 103 #include "third_party/WebKit/public/web/WebPluginContainer.h"
104 #include "third_party/WebKit/public/web/WebPluginParams.h" 104 #include "third_party/WebKit/public/web/WebPluginParams.h"
105 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" 105 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
106 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 106 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
107 #include "ui/base/l10n/l10n_util.h" 107 #include "ui/base/l10n/l10n_util.h"
108 #include "ui/base/layout.h" 108 #include "ui/base/layout.h"
109 #include "ui/base/resource/resource_bundle.h" 109 #include "ui/base/resource/resource_bundle.h"
110 #include "ui/base/webui/jstemplate_builder.h" 110 #include "ui/base/webui/jstemplate_builder.h"
111 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 111 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
112 112
113 #if !defined(DISABLE_NACL)
114 #include "components/nacl/renderer/nacl_helper.h"
115 #endif
116
113 #if defined(ENABLE_WEBRTC) 117 #if defined(ENABLE_WEBRTC)
114 #include "chrome/renderer/media/webrtc_logging_message_filter.h" 118 #include "chrome/renderer/media/webrtc_logging_message_filter.h"
115 #endif 119 #endif
116 120
117 #if defined(ENABLE_SPELLCHECK) 121 #if defined(ENABLE_SPELLCHECK)
118 #include "chrome/renderer/spellchecker/spellcheck.h" 122 #include "chrome/renderer/spellchecker/spellcheck.h"
119 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 123 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
120 #endif 124 #endif
121 125
122 #if defined(OS_WIN) 126 #if defined(OS_WIN)
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 chrome_observer_->content_setting_rules()); 395 chrome_observer_->content_setting_rules());
392 } 396 }
393 397
394 new extensions::ExtensionFrameHelper(render_frame, 398 new extensions::ExtensionFrameHelper(render_frame,
395 extension_dispatcher_.get()); 399 extension_dispatcher_.get());
396 400
397 #if defined(ENABLE_PLUGINS) 401 #if defined(ENABLE_PLUGINS)
398 new PepperHelper(render_frame); 402 new PepperHelper(render_frame);
399 #endif 403 #endif
400 404
405 #if !defined(DISABLE_NACL)
406 new nacl::NaClHelper(render_frame);
407 #endif
408
401 // TODO(jam): when the frame tree moves into content and parent() works at 409 // TODO(jam): when the frame tree moves into content and parent() works at
402 // RenderFrame construction, simplify this by just checking parent(). 410 // RenderFrame construction, simplify this by just checking parent().
403 if (render_frame->GetRenderView()->GetMainRenderFrame() != render_frame) { 411 if (render_frame->GetRenderView()->GetMainRenderFrame() != render_frame) {
404 // Avoid any race conditions from having the browser tell subframes that 412 // Avoid any race conditions from having the browser tell subframes that
405 // they're prerendering. 413 // they're prerendering.
406 if (prerender::PrerenderHelper::IsPrerendering( 414 if (prerender::PrerenderHelper::IsPrerendering(
407 render_frame->GetRenderView()->GetMainRenderFrame())) { 415 render_frame->GetRenderView()->GetMainRenderFrame())) {
408 new prerender::PrerenderHelper(render_frame); 416 new prerender::PrerenderHelper(render_frame);
409 } 417 }
410 } 418 }
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1452 CommandLine* command_line = CommandLine::ForCurrentProcess();
1445 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); 1453 return !command_line->HasSwitch(extensions::switches::kExtensionProcess);
1446 } 1454 }
1447 1455
1448 blink::WebWorkerPermissionClientProxy* 1456 blink::WebWorkerPermissionClientProxy*
1449 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1457 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1450 content::RenderFrame* render_frame, 1458 content::RenderFrame* render_frame,
1451 blink::WebFrame* frame) { 1459 blink::WebFrame* frame) {
1452 return new WorkerPermissionClientProxy(render_frame, frame); 1460 return new WorkerPermissionClientProxy(render_frame, frame);
1453 } 1461 }
OLDNEW
« no previous file with comments | « no previous file | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698