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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 9235004: [Garbled Text][Infobar] Adding infobar to suggest turning on encoding detection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 514f42d50dff23dd99e4bdedd641434d8cd0e5db..c013f08434f66b558f2bc63581a3444d9b7c9427 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -22,6 +22,8 @@
#include "chrome/browser/download/download_service_factory.h"
#include "chrome/browser/extensions/extension_info_map.h"
#include "chrome/browser/extensions/extension_protocols.h"
+#include "chrome/browser/garbled_text_service.h"
+#include "chrome/browser/garbled_text_url_tracker.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/media/media_internals.h"
#include "chrome/browser/net/chrome_cookie_notification_details.h"
@@ -242,6 +244,10 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
params->notification_service =
DesktopNotificationServiceFactory::GetForProfile(profile);
params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
+ params->garbled_text_params.reset(
+ new GarbledTextServiceParams(
+ profile->GetPrefs(),
+ GarbledTextServiceFactory::GetForProfile(profile)));
ChromeProxyConfigService* proxy_config_service =
ProxyServiceFactory::CreateProxyConfigService(true);
@@ -503,6 +509,8 @@ void ProfileIOData::LazyInitialize() const {
cookie_settings_ = profile_params_->cookie_settings;
notification_service_ = profile_params_->notification_service;
extension_info_map_ = profile_params_->extension_info_map;
+ garbled_text_url_tracker_ = profile_params_->garbled_text_params->
+ CreateTracker(garbled_text_fix_enabled_).Pass();
resource_context_.set_host_resolver(io_thread_globals->host_resolver.get());
resource_context_.set_request_context(main_request_context_);
@@ -539,6 +547,7 @@ void ProfileIOData::ShutdownOnUIThread() {
enable_referrers_.Destroy();
clear_local_state_on_exit_.Destroy();
safe_browsing_enabled_.Destroy();
+ garbled_text_fix_enabled_.Destroy();
#if defined(ENABLE_CONFIGURATION_POLICY)
if (url_blacklist_manager_.get())
url_blacklist_manager_->ShutdownOnUIThread();
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698