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

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

Issue 6672048: Move plugin code to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 9 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 | « chrome/renderer/plugin_channel_host.cc ('k') | chrome/renderer/renderer_glue.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/render_thread.h" 5 #include "chrome/renderer/render_thread.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 14 matching lines...) Expand all
25 #include "chrome/common/child_process_logging.h" 25 #include "chrome/common/child_process_logging.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/dom_storage_messages.h" 27 #include "chrome/common/dom_storage_messages.h"
28 #include "chrome/common/extensions/extension.h" 28 #include "chrome/common/extensions/extension.h"
29 #include "chrome/common/extensions/extension_localization_peer.h" 29 #include "chrome/common/extensions/extension_localization_peer.h"
30 #include "chrome/common/extensions/extension_set.h" 30 #include "chrome/common/extensions/extension_set.h"
31 #include "chrome/common/render_messages.h" 31 #include "chrome/common/render_messages.h"
32 #include "chrome/common/render_messages_params.h" 32 #include "chrome/common/render_messages_params.h"
33 #include "chrome/common/renderer_preferences.h" 33 #include "chrome/common/renderer_preferences.h"
34 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
35 #include "chrome/plugin/npobject_util.h"
36 #include "chrome/renderer/automation/dom_automation_v8_extension.h" 35 #include "chrome/renderer/automation/dom_automation_v8_extension.h"
37 #include "chrome/renderer/cookie_message_filter.h" 36 #include "chrome/renderer/cookie_message_filter.h"
38 #include "chrome/renderer/devtools_agent_filter.h" 37 #include "chrome/renderer/devtools_agent_filter.h"
39 #include "chrome/renderer/extension_groups.h" 38 #include "chrome/renderer/extension_groups.h"
40 #include "chrome/renderer/extensions/chrome_app_bindings.h" 39 #include "chrome/renderer/extensions/chrome_app_bindings.h"
41 #include "chrome/renderer/extensions/event_bindings.h" 40 #include "chrome/renderer/extensions/event_bindings.h"
42 #include "chrome/renderer/extensions/extension_process_bindings.h" 41 #include "chrome/renderer/extensions/extension_process_bindings.h"
43 #include "chrome/renderer/extensions/js_only_v8_extensions.h" 42 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
44 #include "chrome/renderer/extensions/renderer_extension_bindings.h" 43 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
45 #include "chrome/renderer/external_extension.h" 44 #include "chrome/renderer/external_extension.h"
(...skipping 16 matching lines...) Expand all
62 #include "chrome/renderer/spellchecker/spellcheck.h" 61 #include "chrome/renderer/spellchecker/spellcheck.h"
63 #include "chrome/renderer/user_script_slave.h" 62 #include "chrome/renderer/user_script_slave.h"
64 #include "content/common/appcache/appcache_dispatcher.h" 63 #include "content/common/appcache/appcache_dispatcher.h"
65 #include "content/common/database_messages.h" 64 #include "content/common/database_messages.h"
66 #include "content/common/db_message_filter.h" 65 #include "content/common/db_message_filter.h"
67 #include "content/common/gpu_messages.h" 66 #include "content/common/gpu_messages.h"
68 #include "content/common/plugin_messages.h" 67 #include "content/common/plugin_messages.h"
69 #include "content/common/resource_dispatcher.h" 68 #include "content/common/resource_dispatcher.h"
70 #include "content/common/resource_messages.h" 69 #include "content/common/resource_messages.h"
71 #include "content/common/web_database_observer_impl.h" 70 #include "content/common/web_database_observer_impl.h"
71 #include "content/plugin/npobject_util.h"
72 #include "ipc/ipc_channel_handle.h" 72 #include "ipc/ipc_channel_handle.h"
73 #include "ipc/ipc_platform_file.h" 73 #include "ipc/ipc_platform_file.h"
74 #include "net/base/net_errors.h" 74 #include "net/base/net_errors.h"
75 #include "net/base/net_util.h" 75 #include "net/base/net_util.h"
76 #include "third_party/sqlite/sqlite3.h" 76 #include "third_party/sqlite/sqlite3.h"
77 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" 77 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
78 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 78 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
79 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColor.h" 79 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColor.h"
80 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h" 80 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h"
81 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" 81 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
82 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 82 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
83 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" 83 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
84 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 84 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
85 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 85 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
86 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 86 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
87 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h " 87 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h "
88 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" 88 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
89 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispat cher.h" 89 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispat cher.h"
90 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 90 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
91 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 91 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
92 #include "webkit/extensions/v8/benchmarking_extension.h" 92 #include "webkit/extensions/v8/benchmarking_extension.h"
93 #include "webkit/extensions/v8/playback_extension.h" 93 #include "webkit/extensions/v8/playback_extension.h"
94 #include "webkit/glue/webkit_glue.h" 94 #include "webkit/glue/webkit_glue.h"
95 #include "v8/include/v8.h" 95 #include "v8/include/v8.h"
96 96
97 // TODO(port) 97 // TODO(port)
98 #if defined(OS_WIN) 98 #if defined(OS_WIN)
99 #include "chrome/plugin/plugin_channel.h" 99 #include "content/plugin/plugin_channel.h"
100 #else 100 #else
101 #include "base/scoped_handle.h" 101 #include "base/scoped_handle.h"
102 #include "chrome/plugin/plugin_channel_base.h" 102 #include "content/plugin/plugin_channel_base.h"
103 #endif 103 #endif
104 104
105 #if defined(OS_WIN) 105 #if defined(OS_WIN)
106 #include <windows.h> 106 #include <windows.h>
107 #include <objbase.h> 107 #include <objbase.h>
108 #endif 108 #endif
109 109
110 #if defined(OS_MACOSX) 110 #if defined(OS_MACOSX)
111 #include "chrome/app/breakpad_mac.h" 111 #include "chrome/app/breakpad_mac.h"
112 #endif 112 #endif
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 } 1161 }
1162 1162
1163 return false; 1163 return false;
1164 } 1164 }
1165 1165
1166 void RenderThread::RegisterExtension(v8::Extension* extension, 1166 void RenderThread::RegisterExtension(v8::Extension* extension,
1167 bool restrict_to_extensions) { 1167 bool restrict_to_extensions) {
1168 WebScriptController::registerExtension(extension); 1168 WebScriptController::registerExtension(extension);
1169 v8_extensions_[extension->name()] = restrict_to_extensions; 1169 v8_extensions_[extension->name()] = restrict_to_extensions;
1170 } 1170 }
OLDNEW
« no previous file with comments | « chrome/renderer/plugin_channel_host.cc ('k') | chrome/renderer/renderer_glue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698