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

Side by Side Diff: chrome/browser/content_settings/cookie_settings_factory.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/content_settings/cookie_settings_factory.h" 5 #include "chrome/browser/content_settings/cookie_settings_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
9 #include "chrome/browser/profiles/incognito_helpers.h" 10 #include "chrome/browser/profiles/incognito_helpers.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "components/content_settings/core/browser/cookie_settings.h" 12 #include "components/content_settings/core/browser/cookie_settings.h"
12 #include "components/content_settings/core/common/pref_names.h" 13 #include "components/content_settings/core/common/pref_names.h"
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" 14 #include "components/keyed_service/content/browser_context_dependency_manager.h"
14 #include "components/pref_registry/pref_registry_syncable.h" 15 #include "components/pref_registry/pref_registry_syncable.h"
15 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/user_metrics.h" 17 #include "content/public/browser/user_metrics.h"
17 #include "extensions/common/constants.h" 18 #include "extensions/common/constants.h"
18 19
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 CookieSettingsFactory::BuildServiceInstanceFor( 57 CookieSettingsFactory::BuildServiceInstanceFor(
57 content::BrowserContext* context) const { 58 content::BrowserContext* context) const {
58 Profile* profile = static_cast<Profile*>(context); 59 Profile* profile = static_cast<Profile*>(context);
59 if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) { 60 if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) {
60 content::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingEnabled")); 61 content::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingEnabled"));
61 } else { 62 } else {
62 content::RecordAction( 63 content::RecordAction(
63 UserMetricsAction("ThirdPartyCookieBlockingDisabled")); 64 UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
64 } 65 }
65 return new content_settings::CookieSettings( 66 return new content_settings::CookieSettings(
66 profile->GetHostContentSettingsMap(), profile->GetPrefs(), 67 HostContentSettingsMapFactory::GetForProfile(profile),
68 profile->GetPrefs(),
67 extensions::kExtensionScheme); 69 extensions::kExtensionScheme);
68 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698