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

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

Issue 485893007: Rename components/breakpad to components/crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + iOS tests Created 6 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 | Annotate | Revision Log
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 30 matching lines...) Expand all
41 #include "content/shell/common/shell_messages.h" 41 #include "content/shell/common/shell_messages.h"
42 #endif 42 #endif
43 43
44 #if defined(OS_ANDROID) 44 #if defined(OS_ANDROID)
45 #include "base/posix/global_descriptors.h" 45 #include "base/posix/global_descriptors.h"
46 #include "content/shell/android/shell_descriptors.h" 46 #include "content/shell/android/shell_descriptors.h"
47 #endif 47 #endif
48 48
49 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
50 #include "base/mac/os_crash_dumps.h" 50 #include "base/mac/os_crash_dumps.h"
51 #include "components/breakpad/app/breakpad_mac.h" 51 #include "components/crash/app/breakpad_mac.h"
52 #include "content/shell/app/paths_mac.h" 52 #include "content/shell/app/paths_mac.h"
53 #include "content/shell/app/shell_main_delegate_mac.h" 53 #include "content/shell/app/shell_main_delegate_mac.h"
54 #endif // OS_MACOSX 54 #endif // OS_MACOSX
55 55
56 #if defined(OS_WIN) 56 #if defined(OS_WIN)
57 #include <initguid.h> 57 #include <initguid.h>
58 #include <windows.h> 58 #include <windows.h>
59 #include "base/logging_win.h" 59 #include "base/logging_win.h"
60 #include "components/breakpad/app/breakpad_win.h" 60 #include "components/crash/app/breakpad_win.h"
61 #endif 61 #endif
62 62
63 #if defined(OS_POSIX) && !defined(OS_MACOSX) 63 #if defined(OS_POSIX) && !defined(OS_MACOSX)
64 #include "components/breakpad/app/breakpad_linux.h" 64 #include "components/crash/app/breakpad_linux.h"
65 #endif 65 #endif
66 66
67 namespace { 67 namespace {
68 68
69 base::LazyInstance<content::ShellBreakpadClient>::Leaky 69 base::LazyInstance<content::ShellBreakpadClient>::Leaky
70 g_shell_breakpad_client = LAZY_INSTANCE_INITIALIZER; 70 g_shell_breakpad_client = LAZY_INSTANCE_INITIALIZER;
71 71
72 #if defined(OS_WIN) 72 #if defined(OS_WIN)
73 // If "Content Shell" doesn't show up in your list of trace providers in 73 // If "Content Shell" doesn't show up in your list of trace providers in
74 // Sawbuck, add these registry entries to your machine (NOTE the optional 74 // Sawbuck, add these registry entries to your machine (NOTE the optional
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 browser_client_.reset(new ShellContentBrowserClient); 298 browser_client_.reset(new ShellContentBrowserClient);
299 return browser_client_.get(); 299 return browser_client_.get();
300 } 300 }
301 301
302 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 302 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
303 renderer_client_.reset(new ShellContentRendererClient); 303 renderer_client_.reset(new ShellContentRendererClient);
304 return renderer_client_.get(); 304 return renderer_client_.get();
305 } 305 }
306 306
307 } // namespace content 307 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/app/shell_breakpad_client.h ('k') | content/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698