Skip to content

Commit e8893a7

Browse files
committed
Win: fix breakpad build error
1 parent 7074173 commit e8893a7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/shell_content_browser_client.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "base/command_line.h"
2525
#include "base/files/file_path.h"
2626
#include "base/file_util.h"
27-
#include "base/linux_util.h"
2827
#include "base/strings/string_util.h"
2928
#include "base/strings/string_number_conversions.h"
3029
#include "base/threading/thread_restrictions.h"
@@ -44,7 +43,6 @@
4443
#include "content/nw/src/api/dispatcher_host.h"
4544
#include "content/nw/src/breakpad_mac.h"
4645
#include "content/nw/src/common/shell_switches.h"
47-
#include "content/nw/src/crash_handler_host_linux.h"
4846
#include "content/nw/src/browser/printing/print_job_manager.h"
4947
#include "content/nw/src/browser/shell_devtools_delegate.h"
5048
#include "content/nw/src/browser/shell_resource_dispatcher_host_delegate.h"
@@ -63,6 +61,11 @@
6361
#include "content/common/plugin_list.h"
6462
#include "content/public/browser/plugin_service.h"
6563

64+
#if defined(OS_LINUX)
65+
#include "base/linux_util.h"
66+
#include "content/nw/src/crash_handler_host_linux.h"
67+
#endif
68+
6669
using base::FileDescriptor;
6770

6871
namespace {

src/shell_main_delegate.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
198198
return renderer_client_.get();
199199
}
200200

201-
void ShellMainDelegate::ZygoteForked() {
202201
#if defined(OS_POSIX) && !defined(OS_MACOSX)
202+
void ShellMainDelegate::ZygoteForked() {
203203
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
204204
// this up for the browser process in a different manner.
205205
InitCrashReporter();
206-
#endif
207206
}
207+
#endif
208208

209209
} // namespace content

0 commit comments

Comments
 (0)