OLD | NEW |
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/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/profiles/profile_dependency_manager.h" | 12 #include "chrome/browser/profiles/profile_dependency_manager.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "components/user_prefs/pref_registry_syncable.h" | 14 #include "components/user_prefs/pref_registry_syncable.h" |
14 | 15 |
15 | 16 |
16 // static | 17 // static |
17 GoogleURLTracker* GoogleURLTrackerFactory::GetForProfile(Profile* profile) { | 18 GoogleURLTracker* GoogleURLTrackerFactory::GetForProfile(Profile* profile) { |
18 return static_cast<GoogleURLTracker*>( | 19 return static_cast<GoogleURLTracker*>( |
19 GetInstance()->GetServiceForProfile(profile, true)); | 20 GetInstance()->GetServiceForProfile(profile, true)); |
(...skipping 23 matching lines...) Expand all Loading... |
43 void GoogleURLTrackerFactory::RegisterUserPrefs( | 44 void GoogleURLTrackerFactory::RegisterUserPrefs( |
44 PrefRegistrySyncable* user_prefs) { | 45 PrefRegistrySyncable* user_prefs) { |
45 user_prefs->RegisterStringPref(prefs::kLastKnownGoogleURL, | 46 user_prefs->RegisterStringPref(prefs::kLastKnownGoogleURL, |
46 GoogleURLTracker::kDefaultGoogleHomepage, | 47 GoogleURLTracker::kDefaultGoogleHomepage, |
47 PrefRegistrySyncable::UNSYNCABLE_PREF); | 48 PrefRegistrySyncable::UNSYNCABLE_PREF); |
48 user_prefs->RegisterStringPref(prefs::kLastPromptedGoogleURL, | 49 user_prefs->RegisterStringPref(prefs::kLastPromptedGoogleURL, |
49 std::string(), | 50 std::string(), |
50 PrefRegistrySyncable::UNSYNCABLE_PREF); | 51 PrefRegistrySyncable::UNSYNCABLE_PREF); |
51 } | 52 } |
52 | 53 |
53 bool GoogleURLTrackerFactory::ServiceRedirectedInIncognito() const { | 54 content::BrowserContext* GoogleURLTrackerFactory::GetBrowserContextToUse( |
54 return true; | 55 content::BrowserContext* context) const { |
| 56 return chrome::GetBrowserContextRedirectedInIncognito(context); |
55 } | 57 } |
56 | 58 |
57 bool GoogleURLTrackerFactory::ServiceIsCreatedWithProfile() const { | 59 bool GoogleURLTrackerFactory::ServiceIsCreatedWithProfile() const { |
58 return true; | 60 return true; |
59 } | 61 } |
60 | 62 |
61 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const { | 63 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const { |
62 return true; | 64 return true; |
63 } | 65 } |
OLD | NEW |