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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_actions_model_factory.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_FACTORY_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_FACTORY_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_FACTORY_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_FACTORY_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include <memory>
9
9 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 11 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
11 12
12 class Profile; 13 class Profile;
13 14
14 class ToolbarActionsModel; 15 class ToolbarActionsModel;
15 16
16 class ToolbarActionsModelFactory : public BrowserContextKeyedServiceFactory { 17 class ToolbarActionsModelFactory : public BrowserContextKeyedServiceFactory {
17 public: 18 public:
18 static ToolbarActionsModel* GetForProfile(Profile* profile); 19 static ToolbarActionsModel* GetForProfile(Profile* profile);
19 20
20 static ToolbarActionsModelFactory* GetInstance(); 21 static ToolbarActionsModelFactory* GetInstance();
21 22
22 private: 23 private:
23 friend struct base::DefaultSingletonTraits<ToolbarActionsModelFactory>; 24 friend struct base::DefaultSingletonTraits<ToolbarActionsModelFactory>;
24 25
25 ToolbarActionsModelFactory(); 26 ToolbarActionsModelFactory();
26 ~ToolbarActionsModelFactory() override; 27 ~ToolbarActionsModelFactory() override;
27 28
28 KeyedService* BuildServiceInstanceFor( 29 KeyedService* BuildServiceInstanceFor(
29 content::BrowserContext* profile) const override; 30 content::BrowserContext* profile) const override;
30 content::BrowserContext* GetBrowserContextToUse( 31 content::BrowserContext* GetBrowserContextToUse(
31 content::BrowserContext* context) const override; 32 content::BrowserContext* context) const override;
32 bool ServiceIsCreatedWithBrowserContext() const override; 33 bool ServiceIsCreatedWithBrowserContext() const override;
33 bool ServiceIsNULLWhileTesting() const override; 34 bool ServiceIsNULLWhileTesting() const override;
34 }; 35 };
35 36
36 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_FACTORY_H_ 37 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_FACTORY_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698