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

Side by Side Diff: chrome/browser/google/google_url_tracker_factory.cc

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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 | Annotate | Revision Log
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/google/google_url_tracker_factory.h" 5 #include "chrome/browser/google/google_url_tracker_factory.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/google/google_url_tracker.h" 8 #include "chrome/browser/google/google_url_tracker.h"
9 #include "chrome/browser/google/google_url_tracker_navigation_helper_impl.h" 9 #include "chrome/browser/google/google_url_tracker_navigation_helper_impl.h"
10 #include "chrome/browser/profiles/incognito_helpers.h" 10 #include "chrome/browser/profiles/incognito_helpers.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 13 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
14 #include "components/user_prefs/pref_registry_syncable.h" 14 #include "components/user_prefs/pref_registry_syncable.h"
15 15
16 16
17 // static 17 // static
18 GoogleURLTracker* GoogleURLTrackerFactory::GetForProfile(Profile* profile) { 18 GoogleURLTracker* GoogleURLTrackerFactory::GetForProfile(Profile* profile) {
19 return static_cast<GoogleURLTracker*>( 19 return static_cast<GoogleURLTracker*>(
20 GetInstance()->GetServiceForProfile(profile, true)); 20 GetInstance()->GetServiceForBrowserContext(profile, true));
21 } 21 }
22 22
23 // static 23 // static
24 GoogleURLTrackerFactory* GoogleURLTrackerFactory::GetInstance() { 24 GoogleURLTrackerFactory* GoogleURLTrackerFactory::GetInstance() {
25 return Singleton<GoogleURLTrackerFactory>::get(); 25 return Singleton<GoogleURLTrackerFactory>::get();
26 } 26 }
27 27
28 GoogleURLTrackerFactory::GoogleURLTrackerFactory() 28 GoogleURLTrackerFactory::GoogleURLTrackerFactory()
29 : ProfileKeyedServiceFactory("GoogleURLTracker", 29 : BrowserContextKeyedServiceFactory(
30 ProfileDependencyManager::GetInstance()) { 30 "GoogleURLTracker",
31 BrowserContextDependencyManager::GetInstance()) {
31 } 32 }
32 33
33 GoogleURLTrackerFactory::~GoogleURLTrackerFactory() { 34 GoogleURLTrackerFactory::~GoogleURLTrackerFactory() {
34 } 35 }
35 36
36 ProfileKeyedService* GoogleURLTrackerFactory::BuildServiceInstanceFor( 37 BrowserContextKeyedService* GoogleURLTrackerFactory::BuildServiceInstanceFor(
37 content::BrowserContext* profile) const { 38 content::BrowserContext* profile) const {
38 scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper( 39 scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper(
39 new GoogleURLTrackerNavigationHelperImpl()); 40 new GoogleURLTrackerNavigationHelperImpl());
40 return new GoogleURLTracker(static_cast<Profile*>(profile), nav_helper.Pass(), 41 return new GoogleURLTracker(static_cast<Profile*>(profile), nav_helper.Pass(),
41 GoogleURLTracker::NORMAL_MODE); 42 GoogleURLTracker::NORMAL_MODE);
42 } 43 }
43 44
44 void GoogleURLTrackerFactory::RegisterUserPrefs( 45 void GoogleURLTrackerFactory::RegisterUserPrefs(
45 user_prefs::PrefRegistrySyncable* user_prefs) { 46 user_prefs::PrefRegistrySyncable* user_prefs) {
46 user_prefs->RegisterStringPref( 47 user_prefs->RegisterStringPref(
47 prefs::kLastKnownGoogleURL, 48 prefs::kLastKnownGoogleURL,
48 GoogleURLTracker::kDefaultGoogleHomepage, 49 GoogleURLTracker::kDefaultGoogleHomepage,
49 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 50 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
50 user_prefs->RegisterStringPref( 51 user_prefs->RegisterStringPref(
51 prefs::kLastPromptedGoogleURL, 52 prefs::kLastPromptedGoogleURL,
52 std::string(), 53 std::string(),
53 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 54 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
54 } 55 }
55 56
56 content::BrowserContext* GoogleURLTrackerFactory::GetBrowserContextToUse( 57 content::BrowserContext* GoogleURLTrackerFactory::GetBrowserContextToUse(
57 content::BrowserContext* context) const { 58 content::BrowserContext* context) const {
58 return chrome::GetBrowserContextRedirectedInIncognito(context); 59 return chrome::GetBrowserContextRedirectedInIncognito(context);
59 } 60 }
60 61
61 bool GoogleURLTrackerFactory::ServiceIsCreatedWithProfile() const { 62 bool GoogleURLTrackerFactory::ServiceIsCreatedWithBrowserContext() const {
62 return true; 63 return true;
63 } 64 }
64 65
65 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const { 66 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const {
66 return true; 67 return true;
67 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698