| 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/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "chrome/renderer/app_categorizer.h" | 39 #include "chrome/renderer/app_categorizer.h" |
| 40 #include "chrome/renderer/benchmarking_extension.h" | 40 #include "chrome/renderer/benchmarking_extension.h" |
| 41 #include "chrome/renderer/chrome_render_frame_observer.h" | 41 #include "chrome/renderer/chrome_render_frame_observer.h" |
| 42 #include "chrome/renderer/chrome_render_thread_observer.h" | 42 #include "chrome/renderer/chrome_render_thread_observer.h" |
| 43 #include "chrome/renderer/chrome_render_view_observer.h" | 43 #include "chrome/renderer/chrome_render_view_observer.h" |
| 44 #include "chrome/renderer/content_settings_observer.h" | 44 #include "chrome/renderer/content_settings_observer.h" |
| 45 #include "chrome/renderer/loadtimes_extension_bindings.h" | 45 #include "chrome/renderer/loadtimes_extension_bindings.h" |
| 46 #include "chrome/renderer/media/chrome_key_systems.h" | 46 #include "chrome/renderer/media/chrome_key_systems.h" |
| 47 #include "chrome/renderer/net/net_error_helper.h" | 47 #include "chrome/renderer/net/net_error_helper.h" |
| 48 #include "chrome/renderer/net_benchmarking_extension.h" | 48 #include "chrome/renderer/net_benchmarking_extension.h" |
| 49 #include "chrome/renderer/page_load_histograms.h" | |
| 50 #include "chrome/renderer/page_load_metrics/metrics_render_frame_observer.h" | 49 #include "chrome/renderer/page_load_metrics/metrics_render_frame_observer.h" |
| 51 #include "chrome/renderer/pepper/pepper_helper.h" | 50 #include "chrome/renderer/pepper/pepper_helper.h" |
| 52 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" | 51 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" |
| 53 #include "chrome/renderer/plugins/plugin_preroller.h" | 52 #include "chrome/renderer/plugins/plugin_preroller.h" |
| 54 #include "chrome/renderer/plugins/plugin_uma.h" | 53 #include "chrome/renderer/plugins/plugin_uma.h" |
| 55 #include "chrome/renderer/prerender/prerender_dispatcher.h" | 54 #include "chrome/renderer/prerender/prerender_dispatcher.h" |
| 56 #include "chrome/renderer/prerender/prerender_helper.h" | 55 #include "chrome/renderer/prerender/prerender_helper.h" |
| 57 #include "chrome/renderer/prerender/prerenderer_client.h" | 56 #include "chrome/renderer/prerender/prerenderer_client.h" |
| 58 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" | 57 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" |
| 59 #include "chrome/renderer/safe_browsing/threat_dom_details.h" | 58 #include "chrome/renderer/safe_browsing/threat_dom_details.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 new nacl::NaClHelper(render_frame); | 467 new nacl::NaClHelper(render_frame); |
| 469 #endif | 468 #endif |
| 470 | 469 |
| 471 #if defined(FULL_SAFE_BROWSING) | 470 #if defined(FULL_SAFE_BROWSING) |
| 472 safe_browsing::ThreatDOMDetails::Create(render_frame); | 471 safe_browsing::ThreatDOMDetails::Create(render_frame); |
| 473 #endif | 472 #endif |
| 474 | 473 |
| 475 new NetErrorHelper(render_frame); | 474 new NetErrorHelper(render_frame); |
| 476 | 475 |
| 477 if (render_frame->IsMainFrame()) { | 476 if (render_frame->IsMainFrame()) { |
| 478 // Only attach MainRenderFrameObserver to the main frame, since | 477 // Only attach MetricsRenderFrameObserver to the main frame, since |
| 479 // we only want to log page load metrics for the main frame. | 478 // we only want to log page load metrics for the main frame. |
| 480 new page_load_metrics::MetricsRenderFrameObserver(render_frame); | 479 new page_load_metrics::MetricsRenderFrameObserver(render_frame); |
| 481 // Similarly, PageLoadHistograms are currently only collected for the main | |
| 482 // frame. | |
| 483 new PageLoadHistograms(render_frame); | |
| 484 } else { | 480 } else { |
| 485 // Avoid any race conditions from having the browser tell subframes that | 481 // Avoid any race conditions from having the browser tell subframes that |
| 486 // they're prerendering. | 482 // they're prerendering. |
| 487 if (prerender::PrerenderHelper::IsPrerendering( | 483 if (prerender::PrerenderHelper::IsPrerendering( |
| 488 render_frame->GetRenderView()->GetMainRenderFrame())) { | 484 render_frame->GetRenderView()->GetMainRenderFrame())) { |
| 489 new prerender::PrerenderHelper(render_frame); | 485 new prerender::PrerenderHelper(render_frame); |
| 490 } | 486 } |
| 491 } | 487 } |
| 492 | 488 |
| 493 // Set up a mojo service to test if this page is a distiller page. | 489 // Set up a mojo service to test if this page is a distiller page. |
| (...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1482 | 1478 |
| 1483 url::Replacements<char> r; | 1479 url::Replacements<char> r; |
| 1484 r.SetPath(path.c_str(), url::Component(0, path.length())); | 1480 r.SetPath(path.c_str(), url::Component(0, path.length())); |
| 1485 | 1481 |
| 1486 if (result == internal::NUM_PLUGIN_ERROR) | 1482 if (result == internal::NUM_PLUGIN_ERROR) |
| 1487 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; | 1483 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; |
| 1488 | 1484 |
| 1489 RecordYouTubeRewriteUMA(result); | 1485 RecordYouTubeRewriteUMA(result); |
| 1490 return corrected_url.ReplaceComponents(r); | 1486 return corrected_url.ReplaceComponents(r); |
| 1491 } | 1487 } |
| OLD | NEW |