OLD | NEW |
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 #include "net/spdy/spdy_session.h" | 114 #include "net/spdy/spdy_session.h" |
115 #include "net/spdy/spdy_session_pool.h" | 115 #include "net/spdy/spdy_session_pool.h" |
116 #include "net/url_request/url_request.h" | 116 #include "net/url_request/url_request.h" |
117 #include "net/url_request/url_request_throttler_manager.h" | 117 #include "net/url_request/url_request_throttler_manager.h" |
118 #include "net/websockets/websocket_job.h" | 118 #include "net/websockets/websocket_job.h" |
119 #include "ui/base/l10n/l10n_util.h" | 119 #include "ui/base/l10n/l10n_util.h" |
120 #include "ui/base/resource/resource_bundle.h" | 120 #include "ui/base/resource/resource_bundle.h" |
121 | 121 |
122 #if defined(USE_LINUX_BREAKPAD) | 122 #if defined(USE_LINUX_BREAKPAD) |
123 #include "base/linux_util.h" | 123 #include "base/linux_util.h" |
124 #include "chrome/app/breakpad_linux.h" | 124 #include "chrome/app/breakpad_linuxish.h" |
125 #endif | 125 #endif |
126 | 126 |
127 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 127 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
128 #include "chrome/browser/first_run/upgrade_util_linux.h" | 128 #include "chrome/browser/first_run/upgrade_util_linux.h" |
129 #endif | 129 #endif |
130 | 130 |
131 #if defined(OS_CHROMEOS) | 131 #if defined(OS_CHROMEOS) |
132 #include "chrome/browser/chromeos/cros/cros_library.h" | 132 #include "chrome/browser/chromeos/cros/cros_library.h" |
133 #include "chrome/browser/chromeos/cros_settings.h" | 133 #include "chrome/browser/chromeos/cros_settings.h" |
134 #include "chrome/browser/chromeos/cros_settings_names.h" | 134 #include "chrome/browser/chromeos/cros_settings_names.h" |
(...skipping 1808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1943 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1943 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1944 uma_name += "_XP"; | 1944 uma_name += "_XP"; |
1945 | 1945 |
1946 uma_name += "_PreRead_"; | 1946 uma_name += "_PreRead_"; |
1947 uma_name += pre_read_percentage; | 1947 uma_name += pre_read_percentage; |
1948 AddPreReadHistogramTime(uma_name.c_str(), time); | 1948 AddPreReadHistogramTime(uma_name.c_str(), time); |
1949 } | 1949 } |
1950 #endif | 1950 #endif |
1951 #endif | 1951 #endif |
1952 } | 1952 } |
OLD | NEW |