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

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

Issue 602563003: Fixing script injection in app_shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | 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/renderer/render_frame.h" 7 #include "content/public/renderer/render_frame.h"
8 #include "content/public/renderer/render_frame_observer.h" 8 #include "content/public/renderer/render_frame_observer.h"
9 #include "content/public/renderer/render_frame_observer_tracker.h" 9 #include "content/public/renderer/render_frame_observer_tracker.h"
10 #include "content/public/renderer/render_thread.h" 10 #include "content/public/renderer/render_thread.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // It doesn't seem necessary for either Pepper or NaCl. 104 // It doesn't seem necessary for either Pepper or NaCl.
105 // http://crbug.com/403004 105 // http://crbug.com/403004
106 #if !defined(DISABLE_NACL) 106 #if !defined(DISABLE_NACL)
107 new nacl::NaClHelper(render_frame); 107 new nacl::NaClHelper(render_frame);
108 #endif 108 #endif
109 } 109 }
110 110
111 void ShellContentRendererClient::RenderViewCreated( 111 void ShellContentRendererClient::RenderViewCreated(
112 content::RenderView* render_view) { 112 content::RenderView* render_view) {
113 new ExtensionHelper(render_view, extension_dispatcher_.get()); 113 new ExtensionHelper(render_view, extension_dispatcher_.get());
114 extension_dispatcher_->OnRenderViewCreated(render_view);
114 } 115 }
115 116
116 bool ShellContentRendererClient::OverrideCreatePlugin( 117 bool ShellContentRendererClient::OverrideCreatePlugin(
117 content::RenderFrame* render_frame, 118 content::RenderFrame* render_frame,
118 blink::WebLocalFrame* frame, 119 blink::WebLocalFrame* frame,
119 const blink::WebPluginParams& params, 120 const blink::WebPluginParams& params,
120 blink::WebPlugin** plugin) { 121 blink::WebPlugin** plugin) {
121 // Allow the content module to create the plugin. 122 // Allow the content module to create the plugin.
122 return false; 123 return false;
123 } 124 }
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 176 }
176 177
177 content::BrowserPluginDelegate* 178 content::BrowserPluginDelegate*
178 ShellContentRendererClient::CreateBrowserPluginDelegate( 179 ShellContentRendererClient::CreateBrowserPluginDelegate(
179 content::RenderFrame* render_frame, 180 content::RenderFrame* render_frame,
180 const std::string& mime_type) { 181 const std::string& mime_type) {
181 return new extensions::GuestViewContainer(render_frame, mime_type); 182 return new extensions::GuestViewContainer(render_frame, mime_type);
182 } 183 }
183 184
184 } // namespace extensions 185 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698