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

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

Issue 911463003: NaCl cleanup: Move ppb_nacl_private.h into components/nacl/renderer/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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
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"
11 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
12 #include "extensions/common/extensions_client.h" 12 #include "extensions/common/extensions_client.h"
13 #include "extensions/renderer/default_dispatcher_delegate.h" 13 #include "extensions/renderer/default_dispatcher_delegate.h"
14 #include "extensions/renderer/dispatcher.h" 14 #include "extensions/renderer/dispatcher.h"
15 #include "extensions/renderer/extension_helper.h" 15 #include "extensions/renderer/extension_helper.h"
16 #include "extensions/renderer/guest_view/extensions_guest_view_container.h" 16 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
17 #include "extensions/renderer/guest_view/guest_view_container.h" 17 #include "extensions/renderer/guest_view/guest_view_container.h"
18 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_con tainer.h" 18 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_con tainer.h"
19 #include "extensions/shell/common/shell_extensions_client.h" 19 #include "extensions/shell/common/shell_extensions_client.h"
20 #include "extensions/shell/renderer/shell_extensions_renderer_client.h" 20 #include "extensions/shell/renderer/shell_extensions_renderer_client.h"
21 #include "third_party/WebKit/public/web/WebLocalFrame.h" 21 #include "third_party/WebKit/public/web/WebLocalFrame.h"
22 22
23 #if !defined(DISABLE_NACL) 23 #if !defined(DISABLE_NACL)
24 #include "components/nacl/common/nacl_constants.h" 24 #include "components/nacl/common/nacl_constants.h"
25 #include "components/nacl/renderer/nacl_helper.h" 25 #include "components/nacl/renderer/nacl_helper.h"
26 #include "components/nacl/renderer/ppb_nacl_private.h"
26 #include "components/nacl/renderer/ppb_nacl_private_impl.h" 27 #include "components/nacl/renderer/ppb_nacl_private_impl.h"
27 #include "ppapi/c/private/ppb_nacl_private.h"
28 #endif 28 #endif
29 29
30 using blink::WebFrame; 30 using blink::WebFrame;
31 using blink::WebString; 31 using blink::WebString;
32 using content::RenderThread; 32 using content::RenderThread;
33 33
34 namespace extensions { 34 namespace extensions {
35 35
36 namespace { 36 namespace {
37 37
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 return new extensions::MimeHandlerViewContainer( 193 return new extensions::MimeHandlerViewContainer(
194 render_frame, mime_type, original_url); 194 render_frame, mime_type, original_url);
195 } 195 }
196 } 196 }
197 197
198 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() { 198 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() {
199 return new ShellExtensionsClient; 199 return new ShellExtensionsClient;
200 } 200 }
201 201
202 } // namespace extensions 202 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_nacl_browser_delegate.cc ('k') | ppapi/api/private/ppb_nacl_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698