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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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/browser/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/debug/alias.h" 15 #include "base/debug/alias.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/prefs/pref_service.h" 18 #include "base/prefs/pref_service.h"
19 #include "base/stl_util.h" 19 #include "base/stl_util.h"
20 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
22 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
23 #include "base/thread_task_runner_handle.h" 23 #include "base/thread_task_runner_handle.h"
24 #include "base/threading/sequenced_worker_pool.h" 24 #include "base/threading/sequenced_worker_pool.h"
25 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/chrome_notification_types.h" 26 #include "chrome/browser/chrome_notification_types.h"
27 #include "chrome/browser/content_settings/cookie_settings_factory.h" 27 #include "chrome/browser/content_settings/cookie_settings_factory.h"
28 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
28 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 29 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
29 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 30 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
30 #include "chrome/browser/devtools/devtools_network_controller.h" 31 #include "chrome/browser/devtools/devtools_network_controller.h"
31 #include "chrome/browser/devtools/devtools_network_transaction_factory.h" 32 #include "chrome/browser/devtools/devtools_network_transaction_factory.h"
32 #include "chrome/browser/download/download_service.h" 33 #include "chrome/browser/download/download_service.h"
33 #include "chrome/browser/download/download_service_factory.h" 34 #include "chrome/browser/download/download_service_factory.h"
34 #include "chrome/browser/io_thread.h" 35 #include "chrome/browser/io_thread.h"
35 #include "chrome/browser/media/media_device_id_salt.h" 36 #include "chrome/browser/media/media_device_id_salt.h"
36 #include "chrome/browser/net/chrome_http_user_agent_settings.h" 37 #include "chrome/browser/net/chrome_http_user_agent_settings.h"
37 #include "chrome/browser/net/chrome_net_log.h" 38 #include "chrome/browser/net/chrome_net_log.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 DCHECK_CURRENTLY_ON(BrowserThread::UI); 378 DCHECK_CURRENTLY_ON(BrowserThread::UI);
378 PrefService* pref_service = profile->GetPrefs(); 379 PrefService* pref_service = profile->GetPrefs();
379 PrefService* local_state_pref_service = g_browser_process->local_state(); 380 PrefService* local_state_pref_service = g_browser_process->local_state();
380 381
381 scoped_ptr<ProfileParams> params(new ProfileParams); 382 scoped_ptr<ProfileParams> params(new ProfileParams);
382 params->path = profile->GetPath(); 383 params->path = profile->GetPath();
383 384
384 params->io_thread = g_browser_process->io_thread(); 385 params->io_thread = g_browser_process->io_thread();
385 386
386 params->cookie_settings = CookieSettingsFactory::GetForProfile(profile); 387 params->cookie_settings = CookieSettingsFactory::GetForProfile(profile);
387 params->host_content_settings_map = profile->GetHostContentSettingsMap(); 388 params->host_content_settings_map =
389 HostContentSettingsMapFactory::GetForProfile(profile);
388 params->ssl_config_service = profile->GetSSLConfigService(); 390 params->ssl_config_service = profile->GetSSLConfigService();
389 391
390 #if defined(ENABLE_EXTENSIONS) 392 #if defined(ENABLE_EXTENSIONS)
391 params->extension_info_map = 393 params->extension_info_map =
392 extensions::ExtensionSystem::Get(profile)->info_map(); 394 extensions::ExtensionSystem::Get(profile)->info_map();
393 params->cookie_monster_delegate = new ExtensionCookieMonsterDelegate(profile); 395 params->cookie_monster_delegate = new ExtensionCookieMonsterDelegate(profile);
394 #endif 396 #endif
395 397
396 if (predictors::ResourcePrefetchPredictor* predictor = 398 if (predictors::ResourcePrefetchPredictor* predictor =
397 predictors::ResourcePrefetchPredictorFactory::GetForProfile( 399 predictors::ResourcePrefetchPredictorFactory::GetForProfile(
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 new DevToolsNetworkTransactionFactory( 1337 new DevToolsNetworkTransactionFactory(
1336 network_controller_handle_.GetController(), shared_session), 1338 network_controller_handle_.GetController(), shared_session),
1337 shared_session->net_log(), backend)); 1339 shared_session->net_log(), backend));
1338 } 1340 }
1339 1341
1340 void ProfileIOData::SetCookieSettingsForTesting( 1342 void ProfileIOData::SetCookieSettingsForTesting(
1341 content_settings::CookieSettings* cookie_settings) { 1343 content_settings::CookieSettings* cookie_settings) {
1342 DCHECK(!cookie_settings_.get()); 1344 DCHECK(!cookie_settings_.get());
1343 cookie_settings_ = cookie_settings; 1345 cookie_settings_ = cookie_settings;
1344 } 1346 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/push_messaging/push_messaging_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698