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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 9838033: Upstream native crash handling changes for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Revert of Revert with fixes. Created 8 years, 8 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
« no previous file with comments | « chrome/app/breakpad_linuxish.cc ('k') | chrome/browser/chrome_browser_main_linux.cc » ('j') | 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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include <gtk/gtk.h> 82 #include <gtk/gtk.h>
83 #endif 83 #endif
84 84
85 #if defined(USE_X11) 85 #if defined(USE_X11)
86 #include <stdlib.h> 86 #include <stdlib.h>
87 #include <string.h> 87 #include <string.h>
88 #include "ui/base/x/x11_util.h" 88 #include "ui/base/x/x11_util.h"
89 #endif 89 #endif
90 90
91 #if defined(USE_LINUX_BREAKPAD) 91 #if defined(USE_LINUX_BREAKPAD)
92 #include "chrome/app/breakpad_linux.h" 92 #include "chrome/app/breakpad_linuxish.h"
93 #endif 93 #endif
94 94
95 base::LazyInstance<chrome::ChromeContentBrowserClient> 95 base::LazyInstance<chrome::ChromeContentBrowserClient>
96 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; 96 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
97 base::LazyInstance<chrome::ChromeContentRendererClient> 97 base::LazyInstance<chrome::ChromeContentRendererClient>
98 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; 98 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
99 base::LazyInstance<chrome::ChromeContentUtilityClient> 99 base::LazyInstance<chrome::ChromeContentUtilityClient>
100 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; 100 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
101 base::LazyInstance<chrome::ChromeContentPluginClient> 101 base::LazyInstance<chrome::ChromeContentPluginClient>
102 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; 102 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 736
737 #if defined(USE_LINUX_BREAKPAD) 737 #if defined(USE_LINUX_BREAKPAD)
738 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets 738 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
739 // this up for the browser process in a different manner. 739 // this up for the browser process in a different manner.
740 InitCrashReporter(); 740 InitCrashReporter();
741 #endif 741 #endif
742 742
743 InitializeChromeContentClient(process_type); 743 InitializeChromeContentClient(process_type);
744 } 744 }
745 #endif // OS_MACOSX 745 #endif // OS_MACOSX
OLDNEW
« no previous file with comments | « chrome/app/breakpad_linuxish.cc ('k') | chrome/browser/chrome_browser_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698