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

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

Issue 12886023: Remove SandboxedPages and SandboxedCSP from Extension Class (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Yoyo's Created 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/common/extensions/api/extension_action/page_action_handler.h" 21 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
22 #include "chrome/common/extensions/background_info.h" 22 #include "chrome/common/extensions/background_info.h"
23 #include "chrome/common/extensions/csp_handler.h" 23 #include "chrome/common/extensions/csp_handler.h"
24 #include "chrome/common/extensions/extension.h" 24 #include "chrome/common/extensions/extension.h"
25 #include "chrome/common/extensions/extension_constants.h" 25 #include "chrome/common/extensions/extension_constants.h"
26 #include "chrome/common/extensions/extension_manifest_constants.h" 26 #include "chrome/common/extensions/extension_manifest_constants.h"
27 #include "chrome/common/extensions/extension_process_policy.h" 27 #include "chrome/common/extensions/extension_process_policy.h"
28 #include "chrome/common/extensions/extension_set.h" 28 #include "chrome/common/extensions/extension_set.h"
29 #include "chrome/common/extensions/manifest_handler.h" 29 #include "chrome/common/extensions/manifest_handler.h"
30 #include "chrome/common/extensions/manifest_url_handler.h" 30 #include "chrome/common/extensions/manifest_url_handler.h"
31 #include "chrome/common/extensions/sandboxed_page_info.h"
31 #include "chrome/common/extensions/web_accessible_resources_handler.h" 32 #include "chrome/common/extensions/web_accessible_resources_handler.h"
32 #include "chrome/common/external_ipc_fuzzer.h" 33 #include "chrome/common/external_ipc_fuzzer.h"
33 #include "chrome/common/localized_error.h" 34 #include "chrome/common/localized_error.h"
34 #include "chrome/common/render_messages.h" 35 #include "chrome/common/render_messages.h"
35 #include "chrome/common/url_constants.h" 36 #include "chrome/common/url_constants.h"
36 #include "chrome/renderer/benchmarking_extension.h" 37 #include "chrome/renderer/benchmarking_extension.h"
37 #include "chrome/renderer/chrome_render_process_observer.h" 38 #include "chrome/renderer/chrome_render_process_observer.h"
38 #include "chrome/renderer/chrome_render_view_observer.h" 39 #include "chrome/renderer/chrome_render_view_observer.h"
39 #include "chrome/renderer/content_settings_observer.h" 40 #include "chrome/renderer/content_settings_observer.h"
40 #include "chrome/renderer/extensions/chrome_v8_context.h" 41 #include "chrome/renderer/extensions/chrome_v8_context.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 137
137 // Explicitly register all extension ManifestHandlers needed to parse 138 // Explicitly register all extension ManifestHandlers needed to parse
138 // fields used in the renderer. 139 // fields used in the renderer.
139 void RegisterExtensionManifestHandlers() { 140 void RegisterExtensionManifestHandlers() {
140 (new extensions::BackgroundManifestHandler)->Register(); 141 (new extensions::BackgroundManifestHandler)->Register();
141 (new extensions::DevToolsPageHandler)->Register(); 142 (new extensions::DevToolsPageHandler)->Register();
142 (new extensions::WebAccessibleResourcesHandler)->Register(); 143 (new extensions::WebAccessibleResourcesHandler)->Register();
143 (new extensions::PageActionHandler)->Register(); 144 (new extensions::PageActionHandler)->Register();
144 (new extensions::CSPHandler(false))->Register(); // not platform app. 145 (new extensions::CSPHandler(false))->Register(); // not platform app.
145 (new extensions::CSPHandler(true))->Register(); // platform app. 146 (new extensions::CSPHandler(true))->Register(); // platform app.
147 (new extensions::SandboxedPageHandler)->Register();
146 } 148 }
147 149
148 static void AppendParams(const std::vector<string16>& additional_names, 150 static void AppendParams(const std::vector<string16>& additional_names,
149 const std::vector<string16>& additional_values, 151 const std::vector<string16>& additional_values,
150 WebVector<WebString>* existing_names, 152 WebVector<WebString>* existing_names,
151 WebVector<WebString>* existing_values) { 153 WebVector<WebString>* existing_values) {
152 DCHECK(additional_names.size() == additional_values.size()); 154 DCHECK(additional_names.size() == additional_values.size());
153 DCHECK(existing_names->size() == existing_values->size()); 155 DCHECK(existing_names->size() == existing_values->size());
154 156
155 size_t existing_size = existing_names->size(); 157 size_t existing_size = existing_names->size();
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 return false; 1154 return false;
1153 1155
1154 if (container->element().shadowHost().isNull()) 1156 if (container->element().shadowHost().isNull())
1155 return false; 1157 return false;
1156 1158
1157 return container->element().shadowHost().tagName().equals( 1159 return container->element().shadowHost().tagName().equals(
1158 WebString::fromUTF8(kWebViewTagName)); 1160 WebString::fromUTF8(kWebViewTagName));
1159 } 1161 }
1160 1162
1161 } // namespace chrome 1163 } // namespace chrome
OLDNEW
« chrome/common/extensions/extension.cc ('K') | « chrome/common/extensions/sandboxed_page_info.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698