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

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

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 8 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/metrics/user_metrics.h"
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.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 "components/prefs/pref_service.h" 16 #include "components/prefs/pref_service.h"
16 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/user_metrics.h"
18 #include "extensions/common/constants.h" 18 #include "extensions/common/constants.h"
19 19
20 using base::UserMetricsAction; 20 using base::UserMetricsAction;
21 21
22 // static 22 // static
23 scoped_refptr<content_settings::CookieSettings> 23 scoped_refptr<content_settings::CookieSettings>
24 CookieSettingsFactory::GetForProfile(Profile* profile) { 24 CookieSettingsFactory::GetForProfile(Profile* profile) {
25 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 25 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
26 return static_cast<content_settings::CookieSettings*>( 26 return static_cast<content_settings::CookieSettings*>(
27 GetInstance()->GetServiceForBrowserContext(profile, true).get()); 27 GetInstance()->GetServiceForBrowserContext(profile, true).get());
(...skipping 24 matching lines...) Expand all
52 // The incognito profile has its own content settings map. Therefore, it 52 // The incognito profile has its own content settings map. Therefore, it
53 // should get its own CookieSettings. 53 // should get its own CookieSettings.
54 return chrome::GetBrowserContextOwnInstanceInIncognito(context); 54 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
55 } 55 }
56 56
57 scoped_refptr<RefcountedKeyedService> 57 scoped_refptr<RefcountedKeyedService>
58 CookieSettingsFactory::BuildServiceInstanceFor( 58 CookieSettingsFactory::BuildServiceInstanceFor(
59 content::BrowserContext* context) const { 59 content::BrowserContext* context) const {
60 Profile* profile = static_cast<Profile*>(context); 60 Profile* profile = static_cast<Profile*>(context);
61 if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) { 61 if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) {
62 content::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingEnabled")); 62 base::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingEnabled"));
63 } else { 63 } else {
64 content::RecordAction( 64 base::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
65 UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
66 } 65 }
67 return new content_settings::CookieSettings( 66 return new content_settings::CookieSettings(
68 HostContentSettingsMapFactory::GetForProfile(profile), 67 HostContentSettingsMapFactory::GetForProfile(profile),
69 profile->GetPrefs(), 68 profile->GetPrefs(),
70 extensions::kExtensionScheme); 69 extensions::kExtensionScheme);
71 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698