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

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

Issue 1051463003: Move mod_pagespeed metrics out of prerender. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky comments Created 5 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
« no previous file with comments | « chrome/browser/prerender/prerender_util_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/guid.h" 11 #include "base/guid.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/component_updater/component_updater_resource_throttle.h " 15 #include "chrome/browser/component_updater/component_updater_resource_throttle.h "
16 #include "chrome/browser/download/download_request_limiter.h" 16 #include "chrome/browser/download/download_request_limiter.h"
17 #include "chrome/browser/download/download_resource_throttle.h" 17 #include "chrome/browser/download/download_resource_throttle.h"
18 #include "chrome/browser/mod_pagespeed/mod_pagespeed_metrics.h"
18 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" 19 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
19 #include "chrome/browser/plugins/plugin_prefs.h" 20 #include "chrome/browser/plugins/plugin_prefs.h"
20 #include "chrome/browser/prefetch/prefetch.h" 21 #include "chrome/browser/prefetch/prefetch.h"
21 #include "chrome/browser/prerender/prerender_manager.h" 22 #include "chrome/browser/prerender/prerender_manager.h"
22 #include "chrome/browser/prerender/prerender_manager_factory.h" 23 #include "chrome/browser/prerender/prerender_manager_factory.h"
23 #include "chrome/browser/prerender/prerender_resource_throttle.h" 24 #include "chrome/browser/prerender/prerender_resource_throttle.h"
24 #include "chrome/browser/prerender/prerender_util.h" 25 #include "chrome/browser/prerender/prerender_util.h"
25 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/profiles/profile_io_data.h" 27 #include "chrome/browser/profiles/profile_io_data.h"
27 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h " 28 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h "
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 if (request_spec == chrome::kChromeUIOobeURL || 682 if (request_spec == chrome::kChromeUIOobeURL ||
682 request_spec == chrome::kChromeUIChromeSigninURL) { 683 request_spec == chrome::kChromeUIChromeSigninURL) {
683 #else 684 #else
684 if (request_spec == chrome::kChromeUIChromeSigninURL) { 685 if (request_spec == chrome::kChromeUIChromeSigninURL) {
685 #endif 686 #endif
686 net::HttpResponseHeaders* response_headers = request->response_headers(); 687 net::HttpResponseHeaders* response_headers = request->response_headers();
687 if (response_headers && response_headers->HasHeader("x-frame-options")) 688 if (response_headers && response_headers->HasHeader("x-frame-options"))
688 response_headers->RemoveHeader("x-frame-options"); 689 response_headers->RemoveHeader("x-frame-options");
689 } 690 }
690 691
691 prerender::URLRequestResponseStarted(request); 692 mod_pagespeed::RecordMetrics(info->GetResourceType(), request->url(),
693 request->response_headers());
692 } 694 }
693 695
694 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( 696 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
695 const GURL& redirect_url, 697 const GURL& redirect_url,
696 net::URLRequest* request, 698 net::URLRequest* request,
697 content::ResourceContext* resource_context, 699 content::ResourceContext* resource_context,
698 content::ResourceResponse* response) { 700 content::ResourceResponse* response) {
699 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 701 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
700 702
701 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); 703 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 url_request->GetTotalReceivedBytes())); 736 url_request->GetTotalReceivedBytes()));
735 } 737 }
736 } 738 }
737 739
738 // static 740 // static
739 void ChromeResourceDispatcherHostDelegate:: 741 void ChromeResourceDispatcherHostDelegate::
740 SetExternalProtocolHandlerDelegateForTesting( 742 SetExternalProtocolHandlerDelegateForTesting(
741 ExternalProtocolHandler::Delegate* delegate) { 743 ExternalProtocolHandler::Delegate* delegate) {
742 g_external_protocol_handler_delegate = delegate; 744 g_external_protocol_handler_delegate = delegate;
743 } 745 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_util_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698