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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "base/strings/sys_string_conversions.h" | 33 #include "base/strings/sys_string_conversions.h" |
34 #include "base/sys_info.h" | 34 #include "base/sys_info.h" |
35 #include "base/threading/platform_thread.h" | 35 #include "base/threading/platform_thread.h" |
36 #include "base/time.h" | 36 #include "base/time.h" |
37 #include "base/utf_string_conversions.h" | 37 #include "base/utf_string_conversions.h" |
38 #include "base/values.h" | 38 #include "base/values.h" |
39 #include "build/build_config.h" | 39 #include "build/build_config.h" |
40 #include "chrome/browser/about_flags.h" | 40 #include "chrome/browser/about_flags.h" |
41 #include "chrome/browser/browser_process.h" | 41 #include "chrome/browser/browser_process.h" |
42 #include "chrome/browser/browser_process_impl.h" | 42 #include "chrome/browser/browser_process_impl.h" |
| 43 #include "chrome/browser/browser_process_platform_part.h" |
43 #include "chrome/browser/browser_shutdown.h" | 44 #include "chrome/browser/browser_shutdown.h" |
44 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 45 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
45 #include "chrome/browser/component_updater/component_updater_service.h" | 46 #include "chrome/browser/component_updater/component_updater_service.h" |
46 #include "chrome/browser/component_updater/flash_component_installer.h" | 47 #include "chrome/browser/component_updater/flash_component_installer.h" |
47 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
48 #include "chrome/browser/component_updater/recovery_component_installer.h" | 49 #include "chrome/browser/component_updater/recovery_component_installer.h" |
49 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
51 #include "chrome/browser/defaults.h" | 52 #include "chrome/browser/defaults.h" |
52 #include "chrome/browser/extensions/extension_protocols.h" | 53 #include "chrome/browser/extensions/extension_protocols.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 #include "chrome/browser/ui/network_profile_bubble.h" | 173 #include "chrome/browser/ui/network_profile_bubble.h" |
173 #include "chrome/installer/util/helper.h" | 174 #include "chrome/installer/util/helper.h" |
174 #include "chrome/installer/util/install_util.h" | 175 #include "chrome/installer/util/install_util.h" |
175 #include "chrome/installer/util/shell_util.h" | 176 #include "chrome/installer/util/shell_util.h" |
176 #include "net/base/net_util.h" | 177 #include "net/base/net_util.h" |
177 #include "printing/printed_document.h" | 178 #include "printing/printed_document.h" |
178 #include "ui/base/l10n/l10n_util_win.h" | 179 #include "ui/base/l10n/l10n_util_win.h" |
179 #include "ui/base/win/dpi.h" | 180 #include "ui/base/win/dpi.h" |
180 #endif // defined(OS_WIN) | 181 #endif // defined(OS_WIN) |
181 | 182 |
182 #if defined(OS_WIN) && defined(USE_AURA) | |
183 #include "chrome/browser/browser_process_platform_part_aurawin.h" | |
184 #else | |
185 #include "chrome/browser/browser_process_platform_part.h" | |
186 #endif | |
187 | |
188 #if defined(OS_MACOSX) | 183 #if defined(OS_MACOSX) |
189 #include <Security/Security.h> | 184 #include <Security/Security.h> |
190 | 185 |
191 #include "base/mac/scoped_nsautorelease_pool.h" | 186 #include "base/mac/scoped_nsautorelease_pool.h" |
192 #include "chrome/browser/mac/keystone_glue.h" | 187 #include "chrome/browser/mac/keystone_glue.h" |
193 #endif | 188 #endif |
194 | 189 |
195 #if defined(ENABLE_CONFIGURATION_POLICY) | 190 #if defined(ENABLE_CONFIGURATION_POLICY) |
196 #include "policy/policy_constants.h" | 191 #include "policy/policy_constants.h" |
197 #endif | 192 #endif |
(...skipping 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1813 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1808 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1814 uma_name += "_XP"; | 1809 uma_name += "_XP"; |
1815 | 1810 |
1816 uma_name += "_PreRead_"; | 1811 uma_name += "_PreRead_"; |
1817 uma_name += pre_read_percentage; | 1812 uma_name += pre_read_percentage; |
1818 AddPreReadHistogramTime(uma_name.c_str(), time); | 1813 AddPreReadHistogramTime(uma_name.c_str(), time); |
1819 } | 1814 } |
1820 #endif | 1815 #endif |
1821 #endif | 1816 #endif |
1822 } | 1817 } |
OLD | NEW |