OLD | NEW |
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 #include "chrome/browser/chromeos/extensions/media_player_api.h" | 5 #include "chrome/browser/chromeos/extensions/media_player_api.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" | 9 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... |
25 if (!media_player_event_router_) | 25 if (!media_player_event_router_) |
26 media_player_event_router_.reset(new MediaPlayerEventRouter(profile_)); | 26 media_player_event_router_.reset(new MediaPlayerEventRouter(profile_)); |
27 return media_player_event_router_.get(); | 27 return media_player_event_router_.get(); |
28 } | 28 } |
29 | 29 |
30 static base::LazyInstance<ProfileKeyedAPIFactory<MediaPlayerAPI> > | 30 static base::LazyInstance<ProfileKeyedAPIFactory<MediaPlayerAPI> > |
31 g_factory = LAZY_INSTANCE_INITIALIZER; | 31 g_factory = LAZY_INSTANCE_INITIALIZER; |
32 | 32 |
33 // static | 33 // static |
34 ProfileKeyedAPIFactory<MediaPlayerAPI>* MediaPlayerAPI::GetFactoryInstance() { | 34 ProfileKeyedAPIFactory<MediaPlayerAPI>* MediaPlayerAPI::GetFactoryInstance() { |
35 return &g_factory.Get(); | 35 return g_factory.Pointer(); |
36 } | 36 } |
37 | 37 |
38 } // namespace extensions | 38 } // namespace extensions |
OLD | NEW |