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

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

Issue 702433002: Refactor GuestViewContainer to split out WebView related logic and MimeHandlerView related logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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/renderer/render_frame.h" 8 #include "content/public/renderer/render_frame.h"
8 #include "content/public/renderer/render_frame_observer.h" 9 #include "content/public/renderer/render_frame_observer.h"
9 #include "content/public/renderer/render_frame_observer_tracker.h" 10 #include "content/public/renderer/render_frame_observer_tracker.h"
10 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
11 #include "extensions/common/extensions_client.h" 12 #include "extensions/common/extensions_client.h"
12 #include "extensions/renderer/default_dispatcher_delegate.h" 13 #include "extensions/renderer/default_dispatcher_delegate.h"
13 #include "extensions/renderer/dispatcher.h" 14 #include "extensions/renderer/dispatcher.h"
14 #include "extensions/renderer/extension_helper.h" 15 #include "extensions/renderer/extension_helper.h"
15 #include "extensions/renderer/guest_view/guest_view_container.h" 16 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
17 #include "extensions/renderer/guest_view/mime_handler_view_container.h"
16 #include "extensions/shell/common/shell_extensions_client.h" 18 #include "extensions/shell/common/shell_extensions_client.h"
17 #include "extensions/shell/renderer/shell_extensions_renderer_client.h" 19 #include "extensions/shell/renderer/shell_extensions_renderer_client.h"
18 #include "third_party/WebKit/public/web/WebLocalFrame.h" 20 #include "third_party/WebKit/public/web/WebLocalFrame.h"
19 21
20 #if !defined(DISABLE_NACL) 22 #if !defined(DISABLE_NACL)
21 #include "components/nacl/common/nacl_constants.h" 23 #include "components/nacl/common/nacl_constants.h"
22 #include "components/nacl/renderer/nacl_helper.h" 24 #include "components/nacl/renderer/nacl_helper.h"
23 #include "components/nacl/renderer/ppb_nacl_private_impl.h" 25 #include "components/nacl/renderer/ppb_nacl_private_impl.h"
24 #include "ppapi/c/private/ppb_nacl_private.h" 26 #include "ppapi/c/private/ppb_nacl_private.h"
25 #endif 27 #endif
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 173
172 bool ShellContentRendererClient::ShouldEnableSiteIsolationPolicy() const { 174 bool ShellContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
173 // Extension renderers don't need site isolation. 175 // Extension renderers don't need site isolation.
174 return false; 176 return false;
175 } 177 }
176 178
177 content::BrowserPluginDelegate* 179 content::BrowserPluginDelegate*
178 ShellContentRendererClient::CreateBrowserPluginDelegate( 180 ShellContentRendererClient::CreateBrowserPluginDelegate(
179 content::RenderFrame* render_frame, 181 content::RenderFrame* render_frame,
180 const std::string& mime_type) { 182 const std::string& mime_type) {
181 return new extensions::GuestViewContainer(render_frame, mime_type); 183 if (mime_type == content::kBrowserPluginMimeType)
184 return new extensions::ExtensionsGuestViewContainer(render_frame);
185 else
186 return new extensions::MimeHandlerViewContainer(render_frame, mime_type);
182 } 187 }
183 188
184 } // namespace extensions 189 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698