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

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 1315303004: Turn components/crash into a layered component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #endif 50 #endif
51 51
52 #if defined(OS_ANDROID) 52 #if defined(OS_ANDROID)
53 #include "base/android/apk_assets.h" 53 #include "base/android/apk_assets.h"
54 #include "base/posix/global_descriptors.h" 54 #include "base/posix/global_descriptors.h"
55 #include "content/shell/android/shell_descriptors.h" 55 #include "content/shell/android/shell_descriptors.h"
56 #endif 56 #endif
57 57
58 #if defined(OS_MACOSX) 58 #if defined(OS_MACOSX)
59 #include "base/mac/os_crash_dumps.h" 59 #include "base/mac/os_crash_dumps.h"
60 #include "components/crash/app/breakpad_mac.h" 60 #include "components/crash/content/app/breakpad_mac.h"
61 #include "content/shell/app/paths_mac.h" 61 #include "content/shell/app/paths_mac.h"
62 #include "content/shell/app/shell_main_delegate_mac.h" 62 #include "content/shell/app/shell_main_delegate_mac.h"
63 #endif // OS_MACOSX 63 #endif // OS_MACOSX
64 64
65 #if defined(OS_WIN) 65 #if defined(OS_WIN)
66 #include <initguid.h> 66 #include <initguid.h>
67 #include <windows.h> 67 #include <windows.h>
68 #include "base/logging_win.h" 68 #include "base/logging_win.h"
69 #include "components/crash/app/breakpad_win.h" 69 #include "components/crash/content/app/breakpad_win.h"
70 #include "content/shell/common/v8_breakpad_support_win.h" 70 #include "content/shell/common/v8_breakpad_support_win.h"
71 #endif 71 #endif
72 72
73 #if defined(OS_POSIX) && !defined(OS_MACOSX) 73 #if defined(OS_POSIX) && !defined(OS_MACOSX)
74 #include "components/crash/app/breakpad_linux.h" 74 #include "components/crash/content/app/breakpad_linux.h"
75 #endif 75 #endif
76 76
77 namespace { 77 namespace {
78 78
79 base::LazyInstance<content::ShellCrashReporterClient>::Leaky 79 base::LazyInstance<content::ShellCrashReporterClient>::Leaky
80 g_shell_crash_client = LAZY_INSTANCE_INITIALIZER; 80 g_shell_crash_client = LAZY_INSTANCE_INITIALIZER;
81 81
82 #if defined(OS_WIN) 82 #if defined(OS_WIN)
83 // If "Content Shell" doesn't show up in your list of trace providers in 83 // If "Content Shell" doesn't show up in your list of trace providers in
84 // Sawbuck, add these registry entries to your machine (NOTE the optional 84 // Sawbuck, add these registry entries to your machine (NOTE the optional
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 return renderer_client_.get(); 356 return renderer_client_.get();
357 } 357 }
358 358
359 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 359 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
360 utility_client_.reset(new ShellContentUtilityClient); 360 utility_client_.reset(new ShellContentUtilityClient);
361 return utility_client_.get(); 361 return utility_client_.get();
362 } 362 }
363 363
364 } // namespace content 364 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/app/shell_crash_reporter_client.h ('k') | content/shell/browser/layout_test/layout_test_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698