OLD | NEW |
---|---|
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/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h" | 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 19 matching lines...) Expand all Loading... | |
30 #include "chrome/browser/profiles/profile_io_data.h" | 30 #include "chrome/browser/profiles/profile_io_data.h" |
31 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h " | 31 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h " |
32 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 32 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
33 #include "chrome/browser/signin/signin_header_helper.h" | 33 #include "chrome/browser/signin/signin_header_helper.h" |
34 #include "chrome/browser/ui/auto_login_prompter.h" | 34 #include "chrome/browser/ui/auto_login_prompter.h" |
35 #include "chrome/browser/ui/login/login_prompt.h" | 35 #include "chrome/browser/ui/login/login_prompt.h" |
36 #include "chrome/browser/ui/sync/one_click_signin_helper.h" | 36 #include "chrome/browser/ui/sync/one_click_signin_helper.h" |
37 #include "chrome/common/extensions/extension_constants.h" | 37 #include "chrome/common/extensions/extension_constants.h" |
38 #include "chrome/common/extensions/mime_types_handler.h" | 38 #include "chrome/common/extensions/mime_types_handler.h" |
39 #include "chrome/common/render_messages.h" | 39 #include "chrome/common/render_messages.h" |
40 #include "chrome/common/url_constants.h" | |
40 #include "content/public/browser/browser_thread.h" | 41 #include "content/public/browser/browser_thread.h" |
41 #include "content/public/browser/notification_service.h" | 42 #include "content/public/browser/notification_service.h" |
42 #include "content/public/browser/render_process_host.h" | 43 #include "content/public/browser/render_process_host.h" |
43 #include "content/public/browser/render_view_host.h" | 44 #include "content/public/browser/render_view_host.h" |
44 #include "content/public/browser/resource_context.h" | 45 #include "content/public/browser/resource_context.h" |
45 #include "content/public/browser/resource_dispatcher_host.h" | 46 #include "content/public/browser/resource_dispatcher_host.h" |
46 #include "content/public/browser/resource_request_info.h" | 47 #include "content/public/browser/resource_request_info.h" |
47 #include "content/public/browser/stream_handle.h" | 48 #include "content/public/browser/stream_handle.h" |
48 #include "content/public/browser/web_contents.h" | 49 #include "content/public/browser/web_contents.h" |
49 #include "content/public/common/resource_response.h" | 50 #include "content/public/common/resource_response.h" |
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
576 GURL webstore_url(extension_urls::GetWebstoreLaunchURL()); | 577 GURL webstore_url(extension_urls::GetWebstoreLaunchURL()); |
577 if (request->url().DomainIs(webstore_url.host().c_str())) { | 578 if (request->url().DomainIs(webstore_url.host().c_str())) { |
578 net::HttpResponseHeaders* response_headers = request->response_headers(); | 579 net::HttpResponseHeaders* response_headers = request->response_headers(); |
579 if (!response_headers->HasHeaderValue("x-frame-options", "deny") && | 580 if (!response_headers->HasHeaderValue("x-frame-options", "deny") && |
580 !response_headers->HasHeaderValue("x-frame-options", "sameorigin")) { | 581 !response_headers->HasHeaderValue("x-frame-options", "sameorigin")) { |
581 response_headers->RemoveHeader("x-frame-options"); | 582 response_headers->RemoveHeader("x-frame-options"); |
582 response_headers->AddHeader("x-frame-options: sameorigin"); | 583 response_headers->AddHeader("x-frame-options: sameorigin"); |
583 } | 584 } |
584 } | 585 } |
585 | 586 |
587 // Ignores x-frame-options for the chrome signin UI. | |
588 if (request->first_party_for_cookies().SchemeIs(chrome::kChromeUIScheme) && | |
jam
2014/01/26 02:51:46
nit: also here, request->first_party_for_cookies()
guohui
2014/01/29 12:50:51
Done.
| |
589 request->first_party_for_cookies().host() == | |
590 chrome::kChromeUIChromeSigninHost) { | |
591 net::HttpResponseHeaders* response_headers = request->response_headers(); | |
592 if (response_headers->HasHeader("x-frame-options")) | |
593 response_headers->RemoveHeader("x-frame-options"); | |
594 } | |
595 | |
586 prerender::URLRequestResponseStarted(request); | 596 prerender::URLRequestResponseStarted(request); |
587 } | 597 } |
588 | 598 |
589 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( | 599 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( |
590 const GURL& redirect_url, | 600 const GURL& redirect_url, |
591 net::URLRequest* request, | 601 net::URLRequest* request, |
592 content::ResourceContext* resource_context, | 602 content::ResourceContext* resource_context, |
593 content::ResourceResponse* response) { | 603 content::ResourceResponse* response) { |
594 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); | 604 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); |
595 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); | 605 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); |
(...skipping 16 matching lines...) Expand all Loading... | |
612 signin::AppendMirrorRequestHeaderIfPossible(request, redirect_url, io_data, | 622 signin::AppendMirrorRequestHeaderIfPossible(request, redirect_url, io_data, |
613 info->GetChildID(), info->GetRouteID()); | 623 info->GetChildID(), info->GetRouteID()); |
614 } | 624 } |
615 | 625 |
616 // static | 626 // static |
617 void ChromeResourceDispatcherHostDelegate:: | 627 void ChromeResourceDispatcherHostDelegate:: |
618 SetExternalProtocolHandlerDelegateForTesting( | 628 SetExternalProtocolHandlerDelegateForTesting( |
619 ExternalProtocolHandler::Delegate* delegate) { | 629 ExternalProtocolHandler::Delegate* delegate) { |
620 g_external_protocol_handler_delegate = delegate; | 630 g_external_protocol_handler_delegate = delegate; |
621 } | 631 } |
OLD | NEW |