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

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 134263005: Implement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for various iframe bugs Created 6 years, 10 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
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/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 20 matching lines...) Expand all
31 #include "chrome/browser/profiles/profile_io_data.h" 31 #include "chrome/browser/profiles/profile_io_data.h"
32 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h " 32 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h "
33 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 33 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
34 #include "chrome/browser/signin/signin_header_helper.h" 34 #include "chrome/browser/signin/signin_header_helper.h"
35 #include "chrome/browser/ui/auto_login_prompter.h" 35 #include "chrome/browser/ui/auto_login_prompter.h"
36 #include "chrome/browser/ui/login/login_prompt.h" 36 #include "chrome/browser/ui/login/login_prompt.h"
37 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 37 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
38 #include "chrome/common/extensions/extension_constants.h" 38 #include "chrome/common/extensions/extension_constants.h"
39 #include "chrome/common/extensions/mime_types_handler.h" 39 #include "chrome/common/extensions/mime_types_handler.h"
40 #include "chrome/common/render_messages.h" 40 #include "chrome/common/render_messages.h"
41 #include "chrome/common/url_constants.h"
41 #include "content/public/browser/browser_thread.h" 42 #include "content/public/browser/browser_thread.h"
42 #include "content/public/browser/notification_service.h" 43 #include "content/public/browser/notification_service.h"
43 #include "content/public/browser/render_process_host.h" 44 #include "content/public/browser/render_process_host.h"
44 #include "content/public/browser/render_view_host.h" 45 #include "content/public/browser/render_view_host.h"
45 #include "content/public/browser/resource_context.h" 46 #include "content/public/browser/resource_context.h"
46 #include "content/public/browser/resource_dispatcher_host.h" 47 #include "content/public/browser/resource_dispatcher_host.h"
47 #include "content/public/browser/resource_request_info.h" 48 #include "content/public/browser/resource_request_info.h"
48 #include "content/public/browser/stream_handle.h" 49 #include "content/public/browser/stream_handle.h"
49 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
50 #include "content/public/common/resource_response.h" 51 #include "content/public/common/resource_response.h"
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 GURL webstore_url(extension_urls::GetWebstoreLaunchURL()); 628 GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
628 if (request->url().DomainIs(webstore_url.host().c_str())) { 629 if (request->url().DomainIs(webstore_url.host().c_str())) {
629 net::HttpResponseHeaders* response_headers = request->response_headers(); 630 net::HttpResponseHeaders* response_headers = request->response_headers();
630 if (!response_headers->HasHeaderValue("x-frame-options", "deny") && 631 if (!response_headers->HasHeaderValue("x-frame-options", "deny") &&
631 !response_headers->HasHeaderValue("x-frame-options", "sameorigin")) { 632 !response_headers->HasHeaderValue("x-frame-options", "sameorigin")) {
632 response_headers->RemoveHeader("x-frame-options"); 633 response_headers->RemoveHeader("x-frame-options");
633 response_headers->AddHeader("x-frame-options: sameorigin"); 634 response_headers->AddHeader("x-frame-options: sameorigin");
634 } 635 }
635 } 636 }
636 637
638 // Ignores x-frame-options for the chrome signin UI.
639 if (request->first_party_for_cookies().GetOrigin().spec() ==
640 chrome::kChromeUIChromeSigninURL) {
641 net::HttpResponseHeaders* response_headers = request->response_headers();
642 if (response_headers->HasHeader("x-frame-options"))
643 response_headers->RemoveHeader("x-frame-options");
644 }
645
637 prerender::URLRequestResponseStarted(request); 646 prerender::URLRequestResponseStarted(request);
638 } 647 }
639 648
640 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( 649 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
641 const GURL& redirect_url, 650 const GURL& redirect_url,
642 net::URLRequest* request, 651 net::URLRequest* request,
643 content::ResourceContext* resource_context, 652 content::ResourceContext* resource_context,
644 content::ResourceResponse* response) { 653 content::ResourceResponse* response) {
645 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 654 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
646 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); 655 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 url_request->GetTotalReceivedBytes())); 688 url_request->GetTotalReceivedBytes()));
680 } 689 }
681 } 690 }
682 691
683 // static 692 // static
684 void ChromeResourceDispatcherHostDelegate:: 693 void ChromeResourceDispatcherHostDelegate::
685 SetExternalProtocolHandlerDelegateForTesting( 694 SetExternalProtocolHandlerDelegateForTesting(
686 ExternalProtocolHandler::Delegate* delegate) { 695 ExternalProtocolHandler::Delegate* delegate) {
687 g_external_protocol_handler_delegate = delegate; 696 g_external_protocol_handler_delegate = delegate;
688 } 697 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698