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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1821413003: Remove logic for lazy initialization of WebKit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 9 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
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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/crash_logging.h" 10 #include "base/debug/crash_logging.h"
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 #if defined(FULL_SAFE_BROWSING) 348 #if defined(FULL_SAFE_BROWSING)
349 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); 349 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
350 #endif 350 #endif
351 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); 351 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());
352 #if defined(ENABLE_WEBRTC) 352 #if defined(ENABLE_WEBRTC)
353 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter( 353 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter(
354 thread->GetIOMessageLoopProxy()); 354 thread->GetIOMessageLoopProxy());
355 #endif 355 #endif
356 356
357 thread->AddObserver(chrome_observer_.get()); 357 thread->AddObserver(chrome_observer_.get());
358 thread->AddObserver(web_cache_observer_.get());
359 #if defined(FULL_SAFE_BROWSING) 358 #if defined(FULL_SAFE_BROWSING)
360 thread->AddObserver(phishing_classifier_.get()); 359 thread->AddObserver(phishing_classifier_.get());
361 #endif 360 #endif
362 thread->AddObserver(visited_link_slave_.get()); 361 thread->AddObserver(visited_link_slave_.get());
363 thread->AddObserver(prerender_dispatcher_.get()); 362 thread->AddObserver(prerender_dispatcher_.get());
364 thread->AddObserver(SearchBouncer::GetInstance()); 363 thread->AddObserver(SearchBouncer::GetInstance());
365 364
366 #if defined(ENABLE_WEBRTC) 365 #if defined(ENABLE_WEBRTC)
367 thread->AddFilter(webrtc_logging_message_filter_.get()); 366 thread->AddFilter(webrtc_logging_message_filter_.get());
368 #endif 367 #endif
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
1433 // chrome.system.network.getNetworkInterfaces provides the same 1432 // chrome.system.network.getNetworkInterfaces provides the same
1434 // information. Also, the enforcement of sending and binding UDP is already done 1433 // information. Also, the enforcement of sending and binding UDP is already done
1435 // by chrome extension permission model. 1434 // by chrome extension permission model.
1436 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { 1435 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
1437 #if defined(ENABLE_EXTENSIONS) 1436 #if defined(ENABLE_EXTENSIONS)
1438 return !IsStandaloneExtensionProcess(); 1437 return !IsStandaloneExtensionProcess();
1439 #else 1438 #else
1440 return true; 1439 return true;
1441 #endif 1440 #endif
1442 } 1441 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698