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

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

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: l10n again Created 3 years, 9 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 #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 10 matching lines...) Expand all
21 return BrowserContextKeyedAPIFactory<MediaPlayerAPI>::Get(context); 21 return BrowserContextKeyedAPIFactory<MediaPlayerAPI>::Get(context);
22 } 22 }
23 23
24 MediaPlayerEventRouter* MediaPlayerAPI::media_player_event_router() { 24 MediaPlayerEventRouter* MediaPlayerAPI::media_player_event_router() {
25 if (!media_player_event_router_) 25 if (!media_player_event_router_)
26 media_player_event_router_.reset( 26 media_player_event_router_.reset(
27 new MediaPlayerEventRouter(browser_context_)); 27 new MediaPlayerEventRouter(browser_context_));
28 return media_player_event_router_.get(); 28 return media_player_event_router_.get();
29 } 29 }
30 30
31 static base::LazyInstance<BrowserContextKeyedAPIFactory<MediaPlayerAPI> > 31 static base::LazyInstance<
32 g_factory = LAZY_INSTANCE_INITIALIZER; 32 BrowserContextKeyedAPIFactory<MediaPlayerAPI>>::DestructorAtExit g_factory =
33 LAZY_INSTANCE_INITIALIZER;
33 34
34 // static 35 // static
35 BrowserContextKeyedAPIFactory<MediaPlayerAPI>* 36 BrowserContextKeyedAPIFactory<MediaPlayerAPI>*
36 MediaPlayerAPI::GetFactoryInstance() { 37 MediaPlayerAPI::GetFactoryInstance() {
37 return g_factory.Pointer(); 38 return g_factory.Pointer();
38 } 39 }
39 40
40 } // namespace extensions 41 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/input_method_api.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698