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

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

Issue 1312653003: Fix for WebView accessible resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Rebased. Created 5 years, 3 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 new ChromeExtensionsDispatcherDelegate()); 397 new ChromeExtensionsDispatcherDelegate());
398 // ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and 398 // ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and
399 // injects it using SetExtensionDispatcher(). Don't overwrite it. 399 // injects it using SetExtensionDispatcher(). Don't overwrite it.
400 if (!extension_dispatcher_) { 400 if (!extension_dispatcher_) {
401 extension_dispatcher_.reset( 401 extension_dispatcher_.reset(
402 new extensions::Dispatcher(extension_dispatcher_delegate_.get())); 402 new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
403 } 403 }
404 permissions_policy_delegate_.reset( 404 permissions_policy_delegate_.reset(
405 new extensions::RendererPermissionsPolicyDelegate( 405 new extensions::RendererPermissionsPolicyDelegate(
406 extension_dispatcher_.get())); 406 extension_dispatcher_.get()));
407 resource_request_policy_.reset(
408 new extensions::ResourceRequestPolicy(extension_dispatcher_.get()));
407 guest_view_container_dispatcher_.reset( 409 guest_view_container_dispatcher_.reset(
408 new extensions::ExtensionsGuestViewContainerDispatcher()); 410 new extensions::ExtensionsGuestViewContainerDispatcher());
409 #endif 411 #endif
410 412
411 prescient_networking_dispatcher_.reset( 413 prescient_networking_dispatcher_.reset(
412 new network_hints::PrescientNetworkingDispatcher()); 414 new network_hints::PrescientNetworkingDispatcher());
413 #if defined(ENABLE_SPELLCHECK) 415 #if defined(ENABLE_SPELLCHECK)
414 // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using 416 // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using
415 // SetSpellcheck(). Don't overwrite it. 417 // SetSpellcheck(). Don't overwrite it.
416 if (!spellcheck_) { 418 if (!spellcheck_) {
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 bool ChromeContentRendererClient::WillSendRequest( 1292 bool ChromeContentRendererClient::WillSendRequest(
1291 blink::WebFrame* frame, 1293 blink::WebFrame* frame,
1292 ui::PageTransition transition_type, 1294 ui::PageTransition transition_type,
1293 const GURL& url, 1295 const GURL& url,
1294 const GURL& first_party_for_cookies, 1296 const GURL& first_party_for_cookies,
1295 GURL* new_url) { 1297 GURL* new_url) {
1296 // Check whether the request should be allowed. If not allowed, we reset the 1298 // Check whether the request should be allowed. If not allowed, we reset the
1297 // URL to something invalid to prevent the request and cause an error. 1299 // URL to something invalid to prevent the request and cause an error.
1298 #if defined(ENABLE_EXTENSIONS) 1300 #if defined(ENABLE_EXTENSIONS)
1299 if (url.SchemeIs(extensions::kExtensionScheme) && 1301 if (url.SchemeIs(extensions::kExtensionScheme) &&
1300 !extensions::ResourceRequestPolicy::CanRequestResource(url, frame, 1302 !resource_request_policy_->CanRequestResource(url, frame,
1301 transition_type)) { 1303 transition_type)) {
1302 *new_url = GURL(chrome::kExtensionInvalidRequestURL); 1304 *new_url = GURL(chrome::kExtensionInvalidRequestURL);
1303 return true; 1305 return true;
1304 } 1306 }
1305 1307
1306 if (url.SchemeIs(extensions::kExtensionResourceScheme) && 1308 if (url.SchemeIs(extensions::kExtensionResourceScheme) &&
1307 !extensions::ResourceRequestPolicy::CanRequestExtensionResourceScheme( 1309 !resource_request_policy_->CanRequestExtensionResourceScheme(url,
1308 url, 1310 frame)) {
1309 frame)) {
1310 *new_url = GURL(chrome::kExtensionResourceInvalidRequestURL); 1311 *new_url = GURL(chrome::kExtensionResourceInvalidRequestURL);
1311 return true; 1312 return true;
1312 } 1313 }
1313 #endif 1314 #endif
1314 1315
1315 const content::RenderView* render_view = 1316 const content::RenderView* render_view =
1316 content::RenderView::FromWebView(frame->view()); 1317 content::RenderView::FromWebView(frame->view());
1317 SearchBox* search_box = SearchBox::Get(render_view); 1318 SearchBox* search_box = SearchBox::Get(render_view);
1318 if (search_box && url.SchemeIs(chrome::kChromeSearchScheme)) { 1319 if (search_box && url.SchemeIs(chrome::kChromeSearchScheme)) {
1319 SearchBox::ImageSourceType type = SearchBox::NONE; 1320 SearchBox::ImageSourceType type = SearchBox::NONE;
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 context, url); 1652 context, url);
1652 #endif 1653 #endif
1653 } 1654 }
1654 1655
1655 void ChromeContentRendererClient::WillDestroyServiceWorkerContextOnWorkerThread( 1656 void ChromeContentRendererClient::WillDestroyServiceWorkerContextOnWorkerThread(
1656 const GURL& url) { 1657 const GURL& url) {
1657 #if defined(ENABLE_EXTENSIONS) 1658 #if defined(ENABLE_EXTENSIONS)
1658 extensions::Dispatcher::WillDestroyServiceWorkerContextOnWorkerThread(url); 1659 extensions::Dispatcher::WillDestroyServiceWorkerContextOnWorkerThread(url);
1659 #endif 1660 #endif
1660 } 1661 }
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/extensions/resource_request_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698