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

Side by Side Diff: apps/shell/browser/shell_extensions_browser_client.cc

Issue 237793003: Use default CSP for resource loading in webview (instead of platform app's CSP) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test Created 6 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "apps/shell/browser/shell_extensions_browser_client.h" 5 #include "apps/shell/browser/shell_extensions_browser_client.h"
6 6
7 #include "apps/shell/browser/shell_app_sorting.h" 7 #include "apps/shell/browser/shell_app_sorting.h"
8 #include "apps/shell/browser/shell_app_window_api.h" 8 #include "apps/shell/browser/shell_app_window_api.h"
9 #include "apps/shell/browser/shell_extension_system_factory.h" 9 #include "apps/shell/browser/shell_extension_system_factory.h"
10 #include "apps/shell/browser/shell_extension_web_contents_observer.h" 10 #include "apps/shell/browser/shell_extension_web_contents_observer.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 content::BrowserContext* context) const { 143 content::BrowserContext* context) const {
144 return false; 144 return false;
145 } 145 }
146 146
147 bool ShellExtensionsBrowserClient::CanExtensionCrossIncognito( 147 bool ShellExtensionsBrowserClient::CanExtensionCrossIncognito(
148 const extensions::Extension* extension, 148 const extensions::Extension* extension,
149 content::BrowserContext* context) const { 149 content::BrowserContext* context) const {
150 return false; 150 return false;
151 } 151 }
152 152
153 bool ShellExtensionsBrowserClient::IsWebViewRequest(
154 net::URLRequest* request) const {
155 return false;
156 }
157
153 net::URLRequestJob* 158 net::URLRequestJob*
154 ShellExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob( 159 ShellExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
155 net::URLRequest* request, 160 net::URLRequest* request,
156 net::NetworkDelegate* network_delegate, 161 net::NetworkDelegate* network_delegate,
157 const base::FilePath& directory_path, 162 const base::FilePath& directory_path,
158 const std::string& content_security_policy, 163 const std::string& content_security_policy,
159 bool send_cors_header) { 164 bool send_cors_header) {
160 return NULL; 165 return NULL;
161 } 166 }
162 167
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 229
225 // TODO(rockot): Remove dependency on src/chrome once we have some core APIs 230 // TODO(rockot): Remove dependency on src/chrome once we have some core APIs
226 // moved out. Also clean up the comment below. See http://crbug.com/349042. 231 // moved out. Also clean up the comment below. See http://crbug.com/349042.
227 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); 232 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
228 233
229 // Register our simplified implementation for chrome.app.window.create(). 234 // Register our simplified implementation for chrome.app.window.create().
230 registry->RegisterFunction<ShellAppWindowCreateFunction>(); 235 registry->RegisterFunction<ShellAppWindowCreateFunction>();
231 } 236 }
232 237
233 } // namespace extensions 238 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698