| 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/incognito_helpers.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 ProfileKeyedService* GoogleURLTrackerFactory::BuildServiceInstanceFor( | 36 ProfileKeyedService* GoogleURLTrackerFactory::BuildServiceInstanceFor( |
| 37 content::BrowserContext* profile) const { | 37 content::BrowserContext* profile) const { |
| 38 scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper( | 38 scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper( |
| 39 new GoogleURLTrackerNavigationHelperImpl()); | 39 new GoogleURLTrackerNavigationHelperImpl()); |
| 40 return new GoogleURLTracker(static_cast<Profile*>(profile), nav_helper.Pass(), | 40 return new GoogleURLTracker(static_cast<Profile*>(profile), nav_helper.Pass(), |
| 41 GoogleURLTracker::NORMAL_MODE); | 41 GoogleURLTracker::NORMAL_MODE); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void GoogleURLTrackerFactory::RegisterUserPrefs( | 44 void GoogleURLTrackerFactory::RegisterUserPrefs( |
| 45 PrefRegistrySyncable* user_prefs) { | 45 user_prefs::PrefRegistrySyncable* user_prefs) { |
| 46 user_prefs->RegisterStringPref(prefs::kLastKnownGoogleURL, | 46 user_prefs->RegisterStringPref( |
| 47 GoogleURLTracker::kDefaultGoogleHomepage, | 47 prefs::kLastKnownGoogleURL, |
| 48 PrefRegistrySyncable::UNSYNCABLE_PREF); | 48 GoogleURLTracker::kDefaultGoogleHomepage, |
| 49 user_prefs->RegisterStringPref(prefs::kLastPromptedGoogleURL, | 49 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 50 std::string(), | 50 user_prefs->RegisterStringPref( |
| 51 PrefRegistrySyncable::UNSYNCABLE_PREF); | 51 prefs::kLastPromptedGoogleURL, |
| 52 std::string(), |
| 53 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 52 } | 54 } |
| 53 | 55 |
| 54 content::BrowserContext* GoogleURLTrackerFactory::GetBrowserContextToUse( | 56 content::BrowserContext* GoogleURLTrackerFactory::GetBrowserContextToUse( |
| 55 content::BrowserContext* context) const { | 57 content::BrowserContext* context) const { |
| 56 return chrome::GetBrowserContextRedirectedInIncognito(context); | 58 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 57 } | 59 } |
| 58 | 60 |
| 59 bool GoogleURLTrackerFactory::ServiceIsCreatedWithProfile() const { | 61 bool GoogleURLTrackerFactory::ServiceIsCreatedWithProfile() const { |
| 60 return true; | 62 return true; |
| 61 } | 63 } |
| 62 | 64 |
| 63 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const { | 65 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const { |
| 64 return true; | 66 return true; |
| 65 } | 67 } |
| OLD | NEW |