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

Side by Side Diff: extensions/shell/renderer/shell_content_renderer_client.cc

Issue 1301653005: Setup for moving getUserMedia to secure origins only (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Nits Created 5 years, 4 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 | « extensions/renderer/dispatcher.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/renderer/shell_content_renderer_client.h" 5 #include "extensions/shell/renderer/shell_content_renderer_client.h"
6 6
7 #include "content/public/common/content_constants.h" 7 #include "content/public/common/content_constants.h"
8 #include "content/public/renderer/render_frame.h" 8 #include "content/public/renderer/render_frame.h"
9 #include "content/public/renderer/render_frame_observer.h" 9 #include "content/public/renderer/render_frame_observer.h"
10 #include "content/public/renderer/render_frame_observer_tracker.h" 10 #include "content/public/renderer/render_frame_observer_tracker.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 extension_dispatcher_delegate_.reset(new DispatcherDelegate()); 52 extension_dispatcher_delegate_.reset(new DispatcherDelegate());
53 53
54 // Must be initialized after ExtensionsRendererClient. 54 // Must be initialized after ExtensionsRendererClient.
55 extension_dispatcher_.reset( 55 extension_dispatcher_.reset(
56 new Dispatcher(extension_dispatcher_delegate_.get())); 56 new Dispatcher(extension_dispatcher_delegate_.get()));
57 thread->AddObserver(extension_dispatcher_.get()); 57 thread->AddObserver(extension_dispatcher_.get());
58 58
59 guest_view_container_dispatcher_.reset( 59 guest_view_container_dispatcher_.reset(
60 new ExtensionsGuestViewContainerDispatcher()); 60 new ExtensionsGuestViewContainerDispatcher());
61 thread->AddObserver(guest_view_container_dispatcher_.get()); 61 thread->AddObserver(guest_view_container_dispatcher_.get());
62
63 // TODO(jamescook): Init WebSecurityPolicy for chrome-extension: schemes.
64 // See ChromeContentRendererClient for details.
65 } 62 }
66 63
67 void ShellContentRendererClient::RenderFrameCreated( 64 void ShellContentRendererClient::RenderFrameCreated(
68 content::RenderFrame* render_frame) { 65 content::RenderFrame* render_frame) {
69 // ExtensionFrameHelper destroys itself when the RenderFrame is destroyed. 66 // ExtensionFrameHelper destroys itself when the RenderFrame is destroyed.
70 new ExtensionFrameHelper(render_frame, extension_dispatcher_.get()); 67 new ExtensionFrameHelper(render_frame, extension_dispatcher_.get());
71 extension_dispatcher_->OnRenderFrameCreated(render_frame); 68 extension_dispatcher_->OnRenderFrameCreated(render_frame);
72 69
73 // TODO(jamescook): Do we need to add a new PepperHelper(render_frame) here? 70 // TODO(jamescook): Do we need to add a new PepperHelper(render_frame) here?
74 // It doesn't seem necessary for either Pepper or NaCl. 71 // It doesn't seem necessary for either Pepper or NaCl.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 return new extensions::MimeHandlerViewContainer( 142 return new extensions::MimeHandlerViewContainer(
146 render_frame, mime_type, original_url); 143 render_frame, mime_type, original_url);
147 } 144 }
148 } 145 }
149 146
150 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() { 147 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() {
151 return new ShellExtensionsClient; 148 return new ShellExtensionsClient;
152 } 149 }
153 150
154 } // namespace extensions 151 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/renderer/dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698