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

Side by Side Diff: ios/chrome/browser/history/web_history_service_factory.h

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 #ifndef IOS_CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_FACTORY_H_ 5 #ifndef IOS_CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_FACTORY_H_
6 #define IOS_CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_FACTORY_H_ 6 #define IOS_CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_FACTORY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h" 10 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
11 11
12 template <typename T> 12 template <typename T>
13 struct DefaultSingletonTraits; 13 struct base::DefaultSingletonTraits;
14 14
15 namespace history { 15 namespace history {
16 class WebHistoryService; 16 class WebHistoryService;
17 } 17 }
18 18
19 namespace ios { 19 namespace ios {
20 20
21 class ChromeBrowserState; 21 class ChromeBrowserState;
22 22
23 // Singleton that owns all WebHistoryServices and associates them with 23 // Singleton that owns all WebHistoryServices and associates them with
24 // ios::ChromeBrowserState. 24 // ios::ChromeBrowserState.
25 class WebHistoryServiceFactory : public BrowserStateKeyedServiceFactory { 25 class WebHistoryServiceFactory : public BrowserStateKeyedServiceFactory {
26 public: 26 public:
27 static history::WebHistoryService* GetForBrowserState( 27 static history::WebHistoryService* GetForBrowserState(
28 ios::ChromeBrowserState* browser_state); 28 ios::ChromeBrowserState* browser_state);
29 static WebHistoryServiceFactory* GetInstance(); 29 static WebHistoryServiceFactory* GetInstance();
30 30
31 private: 31 private:
32 friend struct DefaultSingletonTraits<WebHistoryServiceFactory>; 32 friend struct base::DefaultSingletonTraits<WebHistoryServiceFactory>;
33 33
34 WebHistoryServiceFactory(); 34 WebHistoryServiceFactory();
35 ~WebHistoryServiceFactory() override; 35 ~WebHistoryServiceFactory() override;
36 36
37 // BrowserStateKeyedServiceFactory implementation. 37 // BrowserStateKeyedServiceFactory implementation.
38 scoped_ptr<KeyedService> BuildServiceInstanceFor( 38 scoped_ptr<KeyedService> BuildServiceInstanceFor(
39 web::BrowserState* context) const override; 39 web::BrowserState* context) const override;
40 40
41 DISALLOW_COPY_AND_ASSIGN(WebHistoryServiceFactory); 41 DISALLOW_COPY_AND_ASSIGN(WebHistoryServiceFactory);
42 }; 42 };
43 43
44 } // namespace ios 44 } // namespace ios
45 45
46 #endif // IOS_CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_FACTORY_H_ 46 #endif // IOS_CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698