| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 prescient_networking_dispatcher_.reset( | 354 prescient_networking_dispatcher_.reset( |
| 355 new network_hints::PrescientNetworkingDispatcher()); | 355 new network_hints::PrescientNetworkingDispatcher()); |
| 356 #if defined(ENABLE_SPELLCHECK) | 356 #if defined(ENABLE_SPELLCHECK) |
| 357 // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using | 357 // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using |
| 358 // SetSpellcheck(). Don't overwrite it. | 358 // SetSpellcheck(). Don't overwrite it. |
| 359 if (!spellcheck_) { | 359 if (!spellcheck_) { |
| 360 spellcheck_.reset(new SpellCheck()); | 360 spellcheck_.reset(new SpellCheck()); |
| 361 thread->AddObserver(spellcheck_.get()); | 361 thread->AddObserver(spellcheck_.get()); |
| 362 } | 362 } |
| 363 #endif | 363 #endif |
| 364 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); | |
| 365 #if defined(FULL_SAFE_BROWSING) | 364 #if defined(FULL_SAFE_BROWSING) |
| 366 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); | 365 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); |
| 367 #endif | 366 #endif |
| 368 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); | 367 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); |
| 369 subresource_filter_ruleset_dealer_.reset( | 368 subresource_filter_ruleset_dealer_.reset( |
| 370 new subresource_filter::RulesetDealer()); | 369 new subresource_filter::RulesetDealer()); |
| 371 #if defined(ENABLE_WEBRTC) | 370 #if defined(ENABLE_WEBRTC) |
| 372 webrtc_logging_message_filter_ = | 371 webrtc_logging_message_filter_ = |
| 373 new WebRtcLoggingMessageFilter(thread->GetIOTaskRunner()); | 372 new WebRtcLoggingMessageFilter(thread->GetIOTaskRunner()); |
| 374 #endif | 373 #endif |
| 375 | 374 |
| 376 thread->AddObserver(chrome_observer_.get()); | 375 thread->AddObserver(chrome_observer_.get()); |
| 377 #if defined(FULL_SAFE_BROWSING) | 376 #if defined(FULL_SAFE_BROWSING) |
| 378 thread->AddObserver(phishing_classifier_.get()); | 377 thread->AddObserver(phishing_classifier_.get()); |
| 379 #endif | 378 #endif |
| 380 thread->AddObserver(visited_link_slave_.get()); | |
| 381 thread->AddObserver(prerender_dispatcher_.get()); | 379 thread->AddObserver(prerender_dispatcher_.get()); |
| 382 thread->AddObserver(subresource_filter_ruleset_dealer_.get()); | 380 thread->AddObserver(subresource_filter_ruleset_dealer_.get()); |
| 383 thread->AddObserver(SearchBouncer::GetInstance()); | 381 thread->AddObserver(SearchBouncer::GetInstance()); |
| 384 | 382 |
| 385 #if defined(ENABLE_WEBRTC) | 383 #if defined(ENABLE_WEBRTC) |
| 386 thread->AddFilter(webrtc_logging_message_filter_.get()); | 384 thread->AddFilter(webrtc_logging_message_filter_.get()); |
| 387 #endif | 385 #endif |
| 388 | 386 |
| 389 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); | 387 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); |
| 390 | 388 |
| (...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1141 | 1139 |
| 1142 if (type != SearchBox::NONE) | 1140 if (type != SearchBox::NONE) |
| 1143 return search_box->GenerateImageURLFromTransientURL(url, type, new_url); | 1141 return search_box->GenerateImageURLFromTransientURL(url, type, new_url); |
| 1144 } | 1142 } |
| 1145 | 1143 |
| 1146 return false; | 1144 return false; |
| 1147 } | 1145 } |
| 1148 | 1146 |
| 1149 unsigned long long ChromeContentRendererClient::VisitedLinkHash( | 1147 unsigned long long ChromeContentRendererClient::VisitedLinkHash( |
| 1150 const char* canonical_url, size_t length) { | 1148 const char* canonical_url, size_t length) { |
| 1151 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); | 1149 return chrome_observer_->visited_link_slave()->ComputeURLFingerprint( |
| 1150 canonical_url, length); |
| 1152 } | 1151 } |
| 1153 | 1152 |
| 1154 bool ChromeContentRendererClient::IsLinkVisited(unsigned long long link_hash) { | 1153 bool ChromeContentRendererClient::IsLinkVisited(unsigned long long link_hash) { |
| 1155 return visited_link_slave_->IsVisited(link_hash); | 1154 return chrome_observer_->visited_link_slave()->IsVisited(link_hash); |
| 1156 } | 1155 } |
| 1157 | 1156 |
| 1158 blink::WebPrescientNetworking* | 1157 blink::WebPrescientNetworking* |
| 1159 ChromeContentRendererClient::GetPrescientNetworking() { | 1158 ChromeContentRendererClient::GetPrescientNetworking() { |
| 1160 return prescient_networking_dispatcher_.get(); | 1159 return prescient_networking_dispatcher_.get(); |
| 1161 } | 1160 } |
| 1162 | 1161 |
| 1163 bool ChromeContentRendererClient::ShouldOverridePageVisibilityState( | 1162 bool ChromeContentRendererClient::ShouldOverridePageVisibilityState( |
| 1164 const content::RenderFrame* render_frame, | 1163 const content::RenderFrame* render_frame, |
| 1165 blink::WebPageVisibilityState* override_state) { | 1164 blink::WebPageVisibilityState* override_state) { |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1465 | 1464 |
| 1466 url::Replacements<char> r; | 1465 url::Replacements<char> r; |
| 1467 r.SetPath(path.c_str(), url::Component(0, path.length())); | 1466 r.SetPath(path.c_str(), url::Component(0, path.length())); |
| 1468 | 1467 |
| 1469 if (result == internal::NUM_PLUGIN_ERROR) | 1468 if (result == internal::NUM_PLUGIN_ERROR) |
| 1470 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; | 1469 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; |
| 1471 | 1470 |
| 1472 RecordYouTubeRewriteUMA(result); | 1471 RecordYouTubeRewriteUMA(result); |
| 1473 return corrected_url.ReplaceComponents(r); | 1472 return corrected_url.ReplaceComponents(r); |
| 1474 } | 1473 } |
| OLD | NEW |