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

Side by Side Diff: content/app/android/content_main.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: 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 "content/app/android/content_main.h" 5 #include "content/app/android/content_main.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "content/public/app/content_main.h" 14 #include "content/public/app/content_main.h"
15 #include "content/public/app/content_main_delegate.h" 15 #include "content/public/app/content_main_delegate.h"
16 #include "content/public/app/content_main_runner.h" 16 #include "content/public/app/content_main_runner.h"
17 #include "content/public/common/content_switches.h" 17 #include "content/public/common/content_switches.h"
18 #include "jni/ContentMain_jni.h" 18 #include "jni/ContentMain_jni.h"
19 19
20 using base::LazyInstance; 20 using base::LazyInstance;
21 using base::android::JavaParamRef; 21 using base::android::JavaParamRef;
22 22
23 namespace content { 23 namespace content {
24 24
25 namespace { 25 namespace {
26 LazyInstance<std::unique_ptr<ContentMainRunner>> g_content_runner = 26 LazyInstance<std::unique_ptr<ContentMainRunner>>::DestructorAtExit
27 LAZY_INSTANCE_INITIALIZER; 27 g_content_runner = LAZY_INSTANCE_INITIALIZER;
28 28
29 LazyInstance<std::unique_ptr<ContentMainDelegate>> g_content_main_delegate = 29 LazyInstance<std::unique_ptr<ContentMainDelegate>>::DestructorAtExit
30 LAZY_INSTANCE_INITIALIZER; 30 g_content_main_delegate = LAZY_INSTANCE_INITIALIZER;
31 31
32 } // namespace 32 } // namespace
33 33
34 static jint Start(JNIEnv* env, const JavaParamRef<jclass>& clazz) { 34 static jint Start(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
35 TRACE_EVENT0("startup", "content::Start"); 35 TRACE_EVENT0("startup", "content::Start");
36 36
37 // On Android we can have multiple requests to start the browser in process 37 // On Android we can have multiple requests to start the browser in process
38 // simultaneously. If we get an asynchonous request followed by a synchronous 38 // simultaneously. If we get an asynchonous request followed by a synchronous
39 // request then we have to call this a second time to finish starting the 39 // request then we have to call this a second time to finish starting the
40 // browser synchronously. 40 // browser synchronously.
41 if (!g_content_runner.Get().get()) { 41 if (!g_content_runner.Get().get()) {
42 ContentMainParams params(g_content_main_delegate.Get().get()); 42 ContentMainParams params(g_content_main_delegate.Get().get());
43 g_content_runner.Get().reset(ContentMainRunner::Create()); 43 g_content_runner.Get().reset(ContentMainRunner::Create());
44 g_content_runner.Get()->Initialize(params); 44 g_content_runner.Get()->Initialize(params);
45 } 45 }
46 return g_content_runner.Get()->Run(); 46 return g_content_runner.Get()->Run();
47 } 47 }
48 48
49 void SetContentMainDelegate(ContentMainDelegate* delegate) { 49 void SetContentMainDelegate(ContentMainDelegate* delegate) {
50 DCHECK(!g_content_main_delegate.Get().get()); 50 DCHECK(!g_content_main_delegate.Get().get());
51 g_content_main_delegate.Get().reset(delegate); 51 g_content_main_delegate.Get().reset(delegate);
52 } 52 }
53 53
54 bool RegisterContentMain(JNIEnv* env) { 54 bool RegisterContentMain(JNIEnv* env) {
55 return RegisterNativesImpl(env); 55 return RegisterNativesImpl(env);
56 } 56 }
57 57
58 } // namespace content 58 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698