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

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

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more errors Created 5 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/google/google_url_tracker_factory.h" 5 #include "ios/chrome/browser/google/google_url_tracker_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "components/google/core/browser/google_pref_names.h" 9 #include "components/google/core/browser/google_pref_names.h"
10 #include "components/google/core/browser/google_url_tracker.h" 10 #include "components/google/core/browser/google_url_tracker.h"
11 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 11 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
12 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" 12 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
13 #include "ios/chrome/browser/google/google_url_tracker_client_impl.h" 13 #include "ios/chrome/browser/google/google_url_tracker_client_impl.h"
14 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h" 14 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"
15 15
16 namespace ios { 16 namespace ios {
17 17
18 // static 18 // static
19 GoogleURLTracker* GoogleURLTrackerFactory::GetForBrowserState( 19 GoogleURLTracker* GoogleURLTrackerFactory::GetForBrowserState(
20 ios::ChromeBrowserState* browser_state) { 20 ios::ChromeBrowserState* browser_state) {
21 return static_cast<GoogleURLTracker*>( 21 return static_cast<GoogleURLTracker*>(
22 GetInstance()->GetServiceForBrowserState(browser_state, true)); 22 GetInstance()->GetServiceForBrowserState(browser_state, true));
23 } 23 }
24 24
25 // static 25 // static
26 GoogleURLTrackerFactory* GoogleURLTrackerFactory::GetInstance() { 26 GoogleURLTrackerFactory* GoogleURLTrackerFactory::GetInstance() {
27 return Singleton<GoogleURLTrackerFactory>::get(); 27 return base::Singleton<GoogleURLTrackerFactory>::get();
28 } 28 }
29 29
30 GoogleURLTrackerFactory::GoogleURLTrackerFactory() 30 GoogleURLTrackerFactory::GoogleURLTrackerFactory()
31 : BrowserStateKeyedServiceFactory( 31 : BrowserStateKeyedServiceFactory(
32 "GoogleURLTracker", 32 "GoogleURLTracker",
33 BrowserStateDependencyManager::GetInstance()) { 33 BrowserStateDependencyManager::GetInstance()) {
34 } 34 }
35 35
36 GoogleURLTrackerFactory::~GoogleURLTrackerFactory() { 36 GoogleURLTrackerFactory::~GoogleURLTrackerFactory() {
37 } 37 }
(...skipping 25 matching lines...) Expand all
63 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const { 63 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const {
64 return true; 64 return true;
65 } 65 }
66 66
67 void GoogleURLTrackerFactory::RegisterBrowserStatePrefs( 67 void GoogleURLTrackerFactory::RegisterBrowserStatePrefs(
68 user_prefs::PrefRegistrySyncable* registry) { 68 user_prefs::PrefRegistrySyncable* registry) {
69 GoogleURLTracker::RegisterProfilePrefs(registry); 69 GoogleURLTracker::RegisterProfilePrefs(registry);
70 } 70 }
71 71
72 } // namespace ios 72 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698