| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 #include "content/browser/download/download_file_manager.h" | 77 #include "content/browser/download/download_file_manager.h" |
| 78 #include "content/browser/download/download_status_updater.h" | 78 #include "content/browser/download/download_status_updater.h" |
| 79 #include "content/browser/download/mhtml_generation_manager.h" | 79 #include "content/browser/download/mhtml_generation_manager.h" |
| 80 #include "content/browser/download/save_file_manager.h" | 80 #include "content/browser/download/save_file_manager.h" |
| 81 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 81 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
| 82 #include "content/browser/net/browser_online_state_observer.h" | 82 #include "content/browser/net/browser_online_state_observer.h" |
| 83 #include "content/browser/plugin_service.h" | 83 #include "content/browser/plugin_service.h" |
| 84 #include "content/browser/renderer_host/render_process_host.h" | 84 #include "content/browser/renderer_host/render_process_host.h" |
| 85 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 85 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
| 86 #include "content/common/net/url_fetcher.h" | 86 #include "content/common/net/url_fetcher.h" |
| 87 #include "content/common/notification_service.h" | 87 #include "content/public/browser/notification_details.h" |
| 88 #include "ipc/ipc_logging.h" | 88 #include "ipc/ipc_logging.h" |
| 89 #include "net/socket/client_socket_pool_manager.h" | 89 #include "net/socket/client_socket_pool_manager.h" |
| 90 #include "net/url_request/url_request_context_getter.h" | 90 #include "net/url_request/url_request_context_getter.h" |
| 91 #include "ui/base/clipboard/clipboard.h" | 91 #include "ui/base/clipboard/clipboard.h" |
| 92 #include "ui/base/l10n/l10n_util.h" | 92 #include "ui/base/l10n/l10n_util.h" |
| 93 #include "webkit/plugins/npapi/plugin_list.h" | 93 #include "webkit/plugins/npapi/plugin_list.h" |
| 94 | 94 |
| 95 #if defined(OS_WIN) | 95 #if defined(OS_WIN) |
| 96 #include "views/focus/view_storage.h" | 96 #include "views/focus/view_storage.h" |
| 97 #elif defined(OS_MACOSX) | 97 #elif defined(OS_MACOSX) |
| (...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1156 } | 1156 } |
| 1157 | 1157 |
| 1158 void BrowserProcessImpl::OnAutoupdateTimer() { | 1158 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1159 if (CanAutorestartForUpdate()) { | 1159 if (CanAutorestartForUpdate()) { |
| 1160 DLOG(WARNING) << "Detected update. Restarting browser."; | 1160 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1161 RestartPersistentInstance(); | 1161 RestartPersistentInstance(); |
| 1162 } | 1162 } |
| 1163 } | 1163 } |
| 1164 | 1164 |
| 1165 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1165 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |