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

Side by Side Diff: headless/lib/headless_content_main_delegate.cc

Issue 2878253002: Fix non-component Win-Clang build of headless_shell (Closed)
Patch Set: Created 3 years, 7 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 | « headless/app/headless_shell.cc ('k') | 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "headless/lib/headless_content_main_delegate.h" 5 #include "headless/lib/headless_content_main_delegate.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 26 matching lines...) Expand all
37 #endif 37 #endif
38 38
39 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 39 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
40 #include "headless/lib/renderer/headless_content_renderer_client.h" 40 #include "headless/lib/renderer/headless_content_renderer_client.h"
41 #endif 41 #endif
42 42
43 namespace headless { 43 namespace headless {
44 namespace { 44 namespace {
45 // Keep in sync with content/common/content_constants_internal.h. 45 // Keep in sync with content/common/content_constants_internal.h.
46 // TODO(skyostil): Add a tracing test for this. 46 // TODO(skyostil): Add a tracing test for this.
47 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
47 const int kTraceEventBrowserProcessSortIndex = -6; 48 const int kTraceEventBrowserProcessSortIndex = -6;
49 #endif
48 50
49 HeadlessContentMainDelegate* g_current_headless_content_main_delegate = nullptr; 51 HeadlessContentMainDelegate* g_current_headless_content_main_delegate = nullptr;
50 52
51 base::LazyInstance<HeadlessCrashReporterClient>::Leaky g_headless_crash_client = 53 base::LazyInstance<HeadlessCrashReporterClient>::Leaky g_headless_crash_client =
52 LAZY_INSTANCE_INITIALIZER; 54 LAZY_INSTANCE_INITIALIZER;
53 55
54 const char kLogFileName[] = "CHROME_LOG_FILE"; 56 const char kLogFileName[] = "CHROME_LOG_FILE";
55 } // namespace 57 } // namespace
56 58
57 HeadlessContentMainDelegate::HeadlessContentMainDelegate( 59 HeadlessContentMainDelegate::HeadlessContentMainDelegate(
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 HeadlessContentMainDelegate::CreateContentRendererClient() { 303 HeadlessContentMainDelegate::CreateContentRendererClient() {
302 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 304 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
303 return nullptr; 305 return nullptr;
304 #else 306 #else
305 renderer_client_ = base::MakeUnique<HeadlessContentRendererClient>(); 307 renderer_client_ = base::MakeUnique<HeadlessContentRendererClient>();
306 return renderer_client_.get(); 308 return renderer_client_.get();
307 #endif 309 #endif
308 } 310 }
309 311
310 } // namespace headless 312 } // namespace headless
OLDNEW
« no previous file with comments | « headless/app/headless_shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698