Chromium Code Reviews| 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 "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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 56 #include "chrome/renderer/worker_content_settings_client_proxy.h" | 56 #include "chrome/renderer/worker_content_settings_client_proxy.h" |
| 57 #include "components/autofill/content/renderer/autofill_agent.h" | 57 #include "components/autofill/content/renderer/autofill_agent.h" |
| 58 #include "components/autofill/content/renderer/password_autofill_agent.h" | 58 #include "components/autofill/content/renderer/password_autofill_agent.h" |
| 59 #include "components/autofill/content/renderer/password_generation_agent.h" | 59 #include "components/autofill/content/renderer/password_generation_agent.h" |
| 60 #include "components/content_settings/core/common/content_settings_pattern.h" | 60 #include "components/content_settings/core/common/content_settings_pattern.h" |
| 61 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_heade rs.h" | 61 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_heade rs.h" |
| 62 #include "components/dom_distiller/core/url_constants.h" | 62 #include "components/dom_distiller/core/url_constants.h" |
| 63 #include "components/nacl/renderer/ppb_nacl_private.h" | 63 #include "components/nacl/renderer/ppb_nacl_private.h" |
| 64 #include "components/nacl/renderer/ppb_nacl_private_impl.h" | 64 #include "components/nacl/renderer/ppb_nacl_private_impl.h" |
| 65 #include "components/network_hints/renderer/prescient_networking_dispatcher.h" | 65 #include "components/network_hints/renderer/prescient_networking_dispatcher.h" |
| 66 #include "components/page_load_metrics/renderer/page_load_metrics_render_frame_o bserver.h" | |
| 66 #include "components/password_manager/content/renderer/credential_manager_client .h" | 67 #include "components/password_manager/content/renderer/credential_manager_client .h" |
| 67 #include "components/pdf/renderer/pepper_pdf_host.h" | 68 #include "components/pdf/renderer/pepper_pdf_host.h" |
| 68 #include "components/plugins/renderer/mobile_youtube_plugin.h" | 69 #include "components/plugins/renderer/mobile_youtube_plugin.h" |
| 69 #include "components/signin/core/common/profile_management_switches.h" | 70 #include "components/signin/core/common/profile_management_switches.h" |
| 70 #include "components/version_info/version_info.h" | 71 #include "components/version_info/version_info.h" |
| 71 #include "components/visitedlink/renderer/visitedlink_slave.h" | 72 #include "components/visitedlink/renderer/visitedlink_slave.h" |
| 72 #include "components/web_cache/renderer/web_cache_render_process_observer.h" | 73 #include "components/web_cache/renderer/web_cache_render_process_observer.h" |
| 73 #include "content/public/common/content_constants.h" | 74 #include "content/public/common/content_constants.h" |
| 74 #include "content/public/renderer/plugin_instance_throttler.h" | 75 #include "content/public/renderer/plugin_instance_throttler.h" |
| 75 #include "content/public/renderer/render_frame.h" | 76 #include "content/public/renderer/render_frame.h" |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 575 new prerender::PrerenderHelper(render_frame); | 576 new prerender::PrerenderHelper(render_frame); |
| 576 } | 577 } |
| 577 } | 578 } |
| 578 | 579 |
| 579 if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame) { | 580 if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame) { |
| 580 // Only attach NetErrorHelper to the main frame, since only the main frame | 581 // Only attach NetErrorHelper to the main frame, since only the main frame |
| 581 // should get error pages. | 582 // should get error pages. |
| 582 new NetErrorHelper(render_frame); | 583 new NetErrorHelper(render_frame); |
| 583 } | 584 } |
| 584 | 585 |
| 586 #if defined(OS_ANDROID) | |
| 587 // TODO(bmcquade): run on all platforms once crbug.com/521010 is resolved. | |
| 588 if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame) { | |
|
nasko
2015/08/20 00:22:18
The code as you have it will break very soon. You
Bryan McQuade
2015/08/25 13:53:36
Done, thanks!
| |
| 589 // Only attach PageLoadMetricsRenderFrameObserver to the main frame, since | |
| 590 // we only want to log page load metrics for the main frame. | |
| 591 new page_load_metrics::PageLoadMetricsRenderFrameObserver(render_frame); | |
| 592 } | |
| 593 #endif | |
| 594 | |
| 585 PasswordAutofillAgent* password_autofill_agent = | 595 PasswordAutofillAgent* password_autofill_agent = |
| 586 new PasswordAutofillAgent(render_frame); | 596 new PasswordAutofillAgent(render_frame); |
| 587 PasswordGenerationAgent* password_generation_agent = | 597 PasswordGenerationAgent* password_generation_agent = |
| 588 new PasswordGenerationAgent(render_frame, password_autofill_agent); | 598 new PasswordGenerationAgent(render_frame, password_autofill_agent); |
| 589 new AutofillAgent(render_frame, password_autofill_agent, | 599 new AutofillAgent(render_frame, password_autofill_agent, |
| 590 password_generation_agent); | 600 password_generation_agent); |
| 591 } | 601 } |
| 592 | 602 |
| 593 void ChromeContentRendererClient::RenderViewCreated( | 603 void ChromeContentRendererClient::RenderViewCreated( |
| 594 content::RenderView* render_view) { | 604 content::RenderView* render_view) { |
| (...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1662 | 1672 |
| 1663 void | 1673 void |
| 1664 ChromeContentRendererClient::DidInitializeServiceWorkerContextOnWorkerThread( | 1674 ChromeContentRendererClient::DidInitializeServiceWorkerContextOnWorkerThread( |
| 1665 v8::Local<v8::Context> context, | 1675 v8::Local<v8::Context> context, |
| 1666 const GURL& url) { | 1676 const GURL& url) { |
| 1667 #if defined(ENABLE_EXTENSIONS) | 1677 #if defined(ENABLE_EXTENSIONS) |
| 1668 extensions::Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread( | 1678 extensions::Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread( |
| 1669 context, url); | 1679 context, url); |
| 1670 #endif | 1680 #endif |
| 1671 } | 1681 } |
| OLD | NEW |