| 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 prescient_networking_dispatcher_.reset( | 355 prescient_networking_dispatcher_.reset( |
| 356 new network_hints::PrescientNetworkingDispatcher()); | 356 new network_hints::PrescientNetworkingDispatcher()); |
| 357 #if defined(ENABLE_SPELLCHECK) | 357 #if defined(ENABLE_SPELLCHECK) |
| 358 // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using | 358 // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using |
| 359 // SetSpellcheck(). Don't overwrite it. | 359 // SetSpellcheck(). Don't overwrite it. |
| 360 if (!spellcheck_) { | 360 if (!spellcheck_) { |
| 361 spellcheck_.reset(new SpellCheck()); | 361 spellcheck_.reset(new SpellCheck()); |
| 362 thread->AddObserver(spellcheck_.get()); | 362 thread->AddObserver(spellcheck_.get()); |
| 363 } | 363 } |
| 364 #endif | 364 #endif |
| 365 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); | |
| 366 #if defined(FULL_SAFE_BROWSING) | 365 #if defined(FULL_SAFE_BROWSING) |
| 367 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); | 366 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); |
| 368 #endif | 367 #endif |
| 369 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); | 368 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); |
| 370 subresource_filter_ruleset_dealer_.reset( | 369 subresource_filter_ruleset_dealer_.reset( |
| 371 new subresource_filter::RulesetDealer()); | 370 new subresource_filter::RulesetDealer()); |
| 372 #if defined(ENABLE_WEBRTC) | 371 #if defined(ENABLE_WEBRTC) |
| 373 webrtc_logging_message_filter_ = | 372 webrtc_logging_message_filter_ = |
| 374 new WebRtcLoggingMessageFilter(thread->GetIOTaskRunner()); | 373 new WebRtcLoggingMessageFilter(thread->GetIOTaskRunner()); |
| 375 #endif | 374 #endif |
| 376 | 375 |
| 377 thread->AddObserver(chrome_observer_.get()); | 376 thread->AddObserver(chrome_observer_.get()); |
| 378 #if defined(FULL_SAFE_BROWSING) | 377 #if defined(FULL_SAFE_BROWSING) |
| 379 thread->AddObserver(phishing_classifier_.get()); | 378 thread->AddObserver(phishing_classifier_.get()); |
| 380 #endif | 379 #endif |
| 381 thread->AddObserver(visited_link_slave_.get()); | |
| 382 thread->AddObserver(prerender_dispatcher_.get()); | 380 thread->AddObserver(prerender_dispatcher_.get()); |
| 383 thread->AddObserver(subresource_filter_ruleset_dealer_.get()); | 381 thread->AddObserver(subresource_filter_ruleset_dealer_.get()); |
| 384 thread->AddObserver(SearchBouncer::GetInstance()); | 382 thread->AddObserver(SearchBouncer::GetInstance()); |
| 385 | 383 |
| 386 #if defined(ENABLE_WEBRTC) | 384 #if defined(ENABLE_WEBRTC) |
| 387 thread->AddFilter(webrtc_logging_message_filter_.get()); | 385 thread->AddFilter(webrtc_logging_message_filter_.get()); |
| 388 #endif | 386 #endif |
| 389 | 387 |
| 390 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); | 388 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); |
| 391 | 389 |
| (...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 | 1147 |
| 1150 bool ChromeContentRendererClient::IsPrefetchOnly( | 1148 bool ChromeContentRendererClient::IsPrefetchOnly( |
| 1151 content::RenderFrame* render_frame, | 1149 content::RenderFrame* render_frame, |
| 1152 const blink::WebURLRequest& request) { | 1150 const blink::WebURLRequest& request) { |
| 1153 return prerender::PrerenderHelper::GetPrerenderMode(render_frame) == | 1151 return prerender::PrerenderHelper::GetPrerenderMode(render_frame) == |
| 1154 prerender::PREFETCH_ONLY; | 1152 prerender::PREFETCH_ONLY; |
| 1155 } | 1153 } |
| 1156 | 1154 |
| 1157 unsigned long long ChromeContentRendererClient::VisitedLinkHash( | 1155 unsigned long long ChromeContentRendererClient::VisitedLinkHash( |
| 1158 const char* canonical_url, size_t length) { | 1156 const char* canonical_url, size_t length) { |
| 1159 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); | 1157 return chrome_observer_->visited_link_slave()->ComputeURLFingerprint( |
| 1158 canonical_url, length); |
| 1160 } | 1159 } |
| 1161 | 1160 |
| 1162 bool ChromeContentRendererClient::IsLinkVisited(unsigned long long link_hash) { | 1161 bool ChromeContentRendererClient::IsLinkVisited(unsigned long long link_hash) { |
| 1163 return visited_link_slave_->IsVisited(link_hash); | 1162 return chrome_observer_->visited_link_slave()->IsVisited(link_hash); |
| 1164 } | 1163 } |
| 1165 | 1164 |
| 1166 blink::WebPrescientNetworking* | 1165 blink::WebPrescientNetworking* |
| 1167 ChromeContentRendererClient::GetPrescientNetworking() { | 1166 ChromeContentRendererClient::GetPrescientNetworking() { |
| 1168 return prescient_networking_dispatcher_.get(); | 1167 return prescient_networking_dispatcher_.get(); |
| 1169 } | 1168 } |
| 1170 | 1169 |
| 1171 bool ChromeContentRendererClient::ShouldOverridePageVisibilityState( | 1170 bool ChromeContentRendererClient::ShouldOverridePageVisibilityState( |
| 1172 const content::RenderFrame* render_frame, | 1171 const content::RenderFrame* render_frame, |
| 1173 blink::WebPageVisibilityState* override_state) { | 1172 blink::WebPageVisibilityState* override_state) { |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1473 | 1472 |
| 1474 url::Replacements<char> r; | 1473 url::Replacements<char> r; |
| 1475 r.SetPath(path.c_str(), url::Component(0, path.length())); | 1474 r.SetPath(path.c_str(), url::Component(0, path.length())); |
| 1476 | 1475 |
| 1477 if (result == internal::NUM_PLUGIN_ERROR) | 1476 if (result == internal::NUM_PLUGIN_ERROR) |
| 1478 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; | 1477 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; |
| 1479 | 1478 |
| 1480 RecordYouTubeRewriteUMA(result); | 1479 RecordYouTubeRewriteUMA(result); |
| 1481 return corrected_url.ReplaceComponents(r); | 1480 return corrected_url.ReplaceComponents(r); |
| 1482 } | 1481 } |
| OLD | NEW |