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

Side by Side Diff: chrome/browser/chromeos/file_manager/volume_manager_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 6 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
7 7
8 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ 8 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
9 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ 9 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
10 10
11 template<typename T> struct DefaultSingletonTraits; 11 template <typename T>
12 struct base::DefaultSingletonTraits;
12 13
13 namespace content { 14 namespace content {
14 class BrowserContext; 15 class BrowserContext;
15 } // namespace content 16 } // namespace content
16 17
17 namespace file_manager { 18 namespace file_manager {
18 19
19 class VolumeManager; 20 class VolumeManager;
20 21
21 // Factory to create VolumeManager. 22 // Factory to create VolumeManager.
(...skipping 10 matching lines...) Expand all
32 content::BrowserContext* context) const override; 33 content::BrowserContext* context) const override;
33 bool ServiceIsCreatedWithBrowserContext() const override; 34 bool ServiceIsCreatedWithBrowserContext() const override;
34 bool ServiceIsNULLWhileTesting() const override; 35 bool ServiceIsNULLWhileTesting() const override;
35 36
36 // BrowserContextKeyedServiceFactory overrides: 37 // BrowserContextKeyedServiceFactory overrides:
37 KeyedService* BuildServiceInstanceFor( 38 KeyedService* BuildServiceInstanceFor(
38 content::BrowserContext* context) const override; 39 content::BrowserContext* context) const override;
39 40
40 private: 41 private:
41 // For Singleton. 42 // For Singleton.
42 friend struct DefaultSingletonTraits<VolumeManagerFactory>; 43 friend struct base::DefaultSingletonTraits<VolumeManagerFactory>;
43 44
44 VolumeManagerFactory(); 45 VolumeManagerFactory();
45 ~VolumeManagerFactory() override; 46 ~VolumeManagerFactory() override;
46 47
47 DISALLOW_COPY_AND_ASSIGN(VolumeManagerFactory); 48 DISALLOW_COPY_AND_ASSIGN(VolumeManagerFactory);
48 }; 49 };
49 50
50 } // namespace file_manager 51 } // namespace file_manager
51 52
52 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ 53 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698