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

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

Issue 1847373005: Fix IWYU violators that don't include scoped_ptr.h in Android build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #include "content/app/android/content_main.h" 5 #include "content/app/android/content_main.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/scoped_ptr.h"
11 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
12 #include "content/public/app/content_main.h" 13 #include "content/public/app/content_main.h"
13 #include "content/public/app/content_main_delegate.h" 14 #include "content/public/app/content_main_delegate.h"
14 #include "content/public/app/content_main_runner.h" 15 #include "content/public/app/content_main_runner.h"
15 #include "content/public/common/content_switches.h" 16 #include "content/public/common/content_switches.h"
16 #include "jni/ContentMain_jni.h" 17 #include "jni/ContentMain_jni.h"
17 18
18 using base::LazyInstance; 19 using base::LazyInstance;
19 20
20 namespace content { 21 namespace content {
(...skipping 25 matching lines...) Expand all
46 void SetContentMainDelegate(ContentMainDelegate* delegate) { 47 void SetContentMainDelegate(ContentMainDelegate* delegate) {
47 DCHECK(!g_content_main_delegate.Get().get()); 48 DCHECK(!g_content_main_delegate.Get().get());
48 g_content_main_delegate.Get().reset(delegate); 49 g_content_main_delegate.Get().reset(delegate);
49 } 50 }
50 51
51 bool RegisterContentMain(JNIEnv* env) { 52 bool RegisterContentMain(JNIEnv* env) {
52 return RegisterNativesImpl(env); 53 return RegisterNativesImpl(env);
53 } 54 }
54 55
55 } // namespace content 56 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698