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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 9999004: Revert 131404 - Upstream native crash handling changes for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/chrome_main_delegate.cc ('k') | chrome/browser/chrome_browser_main_x11.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/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 #include "net/spdy/spdy_session.h" 117 #include "net/spdy/spdy_session.h"
118 #include "net/spdy/spdy_session_pool.h" 118 #include "net/spdy/spdy_session_pool.h"
119 #include "net/url_request/url_request.h" 119 #include "net/url_request/url_request.h"
120 #include "net/url_request/url_request_throttler_manager.h" 120 #include "net/url_request/url_request_throttler_manager.h"
121 #include "net/websockets/websocket_job.h" 121 #include "net/websockets/websocket_job.h"
122 #include "ui/base/l10n/l10n_util.h" 122 #include "ui/base/l10n/l10n_util.h"
123 #include "ui/base/resource/resource_bundle.h" 123 #include "ui/base/resource/resource_bundle.h"
124 124
125 #if defined(USE_LINUX_BREAKPAD) 125 #if defined(USE_LINUX_BREAKPAD)
126 #include "base/linux_util.h" 126 #include "base/linux_util.h"
127 #include "chrome/app/breakpad_linuxish.h" 127 #include "chrome/app/breakpad_linux.h"
128 #endif 128 #endif
129 129
130 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 130 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
131 #include "chrome/browser/first_run/upgrade_util_linux.h" 131 #include "chrome/browser/first_run/upgrade_util_linux.h"
132 #endif 132 #endif
133 133
134 #if defined(OS_CHROMEOS) 134 #if defined(OS_CHROMEOS)
135 #include "chrome/browser/chromeos/cros/cros_library.h" 135 #include "chrome/browser/chromeos/cros/cros_library.h"
136 #include "chrome/browser/chromeos/cros_settings.h" 136 #include "chrome/browser/chromeos/cros_settings.h"
137 #include "chrome/browser/chromeos/cros_settings_names.h" 137 #include "chrome/browser/chromeos/cros_settings_names.h"
(...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after
1975 if (base::win::GetVersion() <= base::win::VERSION_XP) 1975 if (base::win::GetVersion() <= base::win::VERSION_XP)
1976 uma_name += "_XP"; 1976 uma_name += "_XP";
1977 1977
1978 uma_name += "_PreRead_"; 1978 uma_name += "_PreRead_";
1979 uma_name += pre_read_percentage; 1979 uma_name += pre_read_percentage;
1980 AddPreReadHistogramTime(uma_name.c_str(), time); 1980 AddPreReadHistogramTime(uma_name.c_str(), time);
1981 } 1981 }
1982 #endif 1982 #endif
1983 #endif 1983 #endif
1984 } 1984 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_browser_main_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698