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

Side by Side Diff: chrome/browser/chromeos/extensions/media_player_api.h

Issue 1870793002: Convert //chrome/browser/chromeos 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 (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 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_
6 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_ 6 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <string> 10 #include <string>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "extensions/browser/browser_context_keyed_api_factory.h" 14 #include "extensions/browser/browser_context_keyed_api_factory.h"
15 #include "extensions/browser/extension_function.h" 15 #include "extensions/browser/extension_function.h"
16 16
17 namespace content { 17 namespace content {
18 class BrowserContext; 18 class BrowserContext;
19 } 19 }
20 20
21 namespace extensions { 21 namespace extensions {
22 class MediaPlayerEventRouter; 22 class MediaPlayerEventRouter;
23 23
(...skipping 15 matching lines...) Expand all
39 39
40 content::BrowserContext* const browser_context_; 40 content::BrowserContext* const browser_context_;
41 41
42 // BrowserContextKeyedAPI implementation. 42 // BrowserContextKeyedAPI implementation.
43 static const char* service_name() { 43 static const char* service_name() {
44 return "MediaPlayerAPI"; 44 return "MediaPlayerAPI";
45 } 45 }
46 static const bool kServiceRedirectedInIncognito = true; 46 static const bool kServiceRedirectedInIncognito = true;
47 static const bool kServiceIsNULLWhileTesting = true; 47 static const bool kServiceIsNULLWhileTesting = true;
48 48
49 scoped_ptr<MediaPlayerEventRouter> media_player_event_router_; 49 std::unique_ptr<MediaPlayerEventRouter> media_player_event_router_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAPI); 51 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAPI);
52 }; 52 };
53 53
54 } // namespace extensions 54 } // namespace extensions
55 55
56 #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_ 56 #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698