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

Side by Side Diff: content/app/content_main_runner.cc

Issue 2661563002: win: Fix flaky compile failures. (Closed)
Patch Set: . Created 3 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
(...skipping 27 matching lines...) Expand all
38 #include "base/strings/string_number_conversions.h" 38 #include "base/strings/string_number_conversions.h"
39 #include "base/strings/string_util.h" 39 #include "base/strings/string_util.h"
40 #include "base/strings/stringprintf.h" 40 #include "base/strings/stringprintf.h"
41 #include "base/trace_event/trace_event.h" 41 #include "base/trace_event/trace_event.h"
42 #include "build/build_config.h" 42 #include "build/build_config.h"
43 #include "components/tracing/browser/trace_config_file.h" 43 #include "components/tracing/browser/trace_config_file.h"
44 #include "components/tracing/common/trace_to_console.h" 44 #include "components/tracing/common/trace_to_console.h"
45 #include "components/tracing/common/tracing_switches.h" 45 #include "components/tracing/common/tracing_switches.h"
46 #include "content/app/mojo/mojo_init.h" 46 #include "content/app/mojo/mojo_init.h"
47 #include "content/browser/browser_main.h" 47 #include "content/browser/browser_main.h"
48 #include "content/browser/gpu/gpu_process_host.h"
49 #include "content/browser/renderer_host/render_process_host_impl.h" 48 #include "content/browser/renderer_host/render_process_host_impl.h"
50 #include "content/browser/utility_process_host_impl.h" 49 #include "content/browser/utility_process_host_impl.h"
51 #include "content/common/set_process_title.h" 50 #include "content/common/set_process_title.h"
52 #include "content/common/url_schemes.h" 51 #include "content/common/url_schemes.h"
53 #include "content/gpu/in_process_gpu_thread.h" 52 #include "content/gpu/in_process_gpu_thread.h"
54 #include "content/public/app/content_main.h" 53 #include "content/public/app/content_main.h"
55 #include "content/public/app/content_main_delegate.h" 54 #include "content/public/app/content_main_delegate.h"
56 #include "content/public/browser/content_browser_client.h" 55 #include "content/public/browser/content_browser_client.h"
57 #include "content/public/common/content_client.h" 56 #include "content/public/common/content_client.h"
58 #include "content/public/common/content_constants.h" 57 #include "content/public/common/content_constants.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) 104 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
106 #include "content/zygote/zygote_main.h" 105 #include "content/zygote/zygote_main.h"
107 #endif 106 #endif
108 107
109 #endif // OS_POSIX 108 #endif // OS_POSIX
110 109
111 #if defined(USE_NSS_CERTS) 110 #if defined(USE_NSS_CERTS)
112 #include "crypto/nss_util.h" 111 #include "crypto/nss_util.h"
113 #endif 112 #endif
114 113
114 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
115 #include "content/browser/gpu/gpu_process_host.h"
116 #endif
117
115 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 118 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
116 #include "content/common/media/cdm_host_files.h" 119 #include "content/common/media/cdm_host_files.h"
117 #endif 120 #endif
118 121
119 namespace content { 122 namespace content {
120 extern int GpuMain(const content::MainFunctionParams&); 123 extern int GpuMain(const content::MainFunctionParams&);
121 #if BUILDFLAG(ENABLE_PLUGINS) 124 #if BUILDFLAG(ENABLE_PLUGINS)
122 #if !defined(OS_LINUX) 125 #if !defined(OS_LINUX)
123 extern int PluginMain(const content::MainFunctionParams&); 126 extern int PluginMain(const content::MainFunctionParams&);
124 #endif 127 #endif
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 872
870 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 873 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
871 }; 874 };
872 875
873 // static 876 // static
874 ContentMainRunner* ContentMainRunner::Create() { 877 ContentMainRunner* ContentMainRunner::Create() {
875 return new ContentMainRunnerImpl(); 878 return new ContentMainRunnerImpl();
876 } 879 }
877 880
878 } // namespace content 881 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698