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/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 #include "base/win/windows_version.h" | 100 #include "base/win/windows_version.h" |
101 #include "ui/views/focus/view_storage.h" | 101 #include "ui/views/focus/view_storage.h" |
102 #elif defined(OS_MACOSX) | 102 #elif defined(OS_MACOSX) |
103 #include "chrome/browser/chrome_browser_main_mac.h" | 103 #include "chrome/browser/chrome_browser_main_mac.h" |
104 #endif | 104 #endif |
105 | 105 |
106 #if defined(USE_AURA) | 106 #if defined(USE_AURA) |
107 #include "ui/aura/env.h" | 107 #include "ui/aura/env.h" |
108 #endif | 108 #endif |
109 | 109 |
110 #if defined(OS_CHROMEOS) | |
111 #include "chrome/browser/browser_process_platform_part_chromeos.h" | |
112 #elif defined(OS_WIN) && defined(USE_AURA) | |
113 #include "chrome/browser/browser_process_platform_part_aurawin.h" | |
114 #else | |
115 #include "chrome/browser/browser_process_platform_part.h" | |
116 #endif // defined(OS_CHROMEOS) | |
117 | |
118 #if !defined(OS_ANDROID) | 110 #if !defined(OS_ANDROID) |
119 #include "chrome/browser/media_galleries/media_file_system_registry.h" | 111 #include "chrome/browser/media_galleries/media_file_system_registry.h" |
120 #endif | 112 #endif |
121 | 113 |
122 #if defined(ENABLE_PLUGIN_INSTALLATION) | 114 #if defined(ENABLE_PLUGIN_INSTALLATION) |
123 #include "chrome/browser/plugins/plugins_resource_service.h" | 115 #include "chrome/browser/plugins/plugins_resource_service.h" |
124 #endif | 116 #endif |
125 | 117 |
126 #if defined(OS_MACOSX) | 118 #if defined(OS_MACOSX) |
127 #include "apps/app_shim/app_shim_host_manager_mac.h" | 119 #include "apps/app_shim/app_shim_host_manager_mac.h" |
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 } | 1043 } |
1052 | 1044 |
1053 void BrowserProcessImpl::OnAutoupdateTimer() { | 1045 void BrowserProcessImpl::OnAutoupdateTimer() { |
1054 if (CanAutorestartForUpdate()) { | 1046 if (CanAutorestartForUpdate()) { |
1055 DLOG(WARNING) << "Detected update. Restarting browser."; | 1047 DLOG(WARNING) << "Detected update. Restarting browser."; |
1056 RestartBackgroundInstance(); | 1048 RestartBackgroundInstance(); |
1057 } | 1049 } |
1058 } | 1050 } |
1059 | 1051 |
1060 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1052 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |