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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #include "content/public/browser/browser_thread.h" | 82 #include "content/public/browser/browser_thread.h" |
83 #include "content/public/browser/notification_details.h" | 83 #include "content/public/browser/notification_details.h" |
84 #include "content/public/browser/render_process_host.h" | 84 #include "content/public/browser/render_process_host.h" |
85 #include "content/public/common/url_fetcher.h" | 85 #include "content/public/common/url_fetcher.h" |
86 #include "net/socket/client_socket_pool_manager.h" | 86 #include "net/socket/client_socket_pool_manager.h" |
87 #include "net/url_request/url_request_context_getter.h" | 87 #include "net/url_request/url_request_context_getter.h" |
88 #include "ui/base/clipboard/clipboard.h" | 88 #include "ui/base/clipboard/clipboard.h" |
89 #include "ui/base/l10n/l10n_util.h" | 89 #include "ui/base/l10n/l10n_util.h" |
90 | 90 |
91 #if defined(OS_WIN) | 91 #if defined(OS_WIN) |
92 #include "views/focus/view_storage.h" | 92 #include "ui/views/focus/view_storage.h" |
93 #elif defined(OS_MACOSX) | 93 #elif defined(OS_MACOSX) |
94 #include "chrome/browser/chrome_browser_main_mac.h" | 94 #include "chrome/browser/chrome_browser_main_mac.h" |
95 #endif | 95 #endif |
96 | 96 |
97 #if defined(OS_CHROMEOS) | 97 #if defined(OS_CHROMEOS) |
98 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" | 98 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" |
99 #include "chrome/browser/oom_priority_manager.h" | 99 #include "chrome/browser/oom_priority_manager.h" |
100 #endif // defined(OS_CHROMEOS) | 100 #endif // defined(OS_CHROMEOS) |
101 | 101 |
102 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 102 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1098 } | 1098 } |
1099 | 1099 |
1100 void BrowserProcessImpl::OnAutoupdateTimer() { | 1100 void BrowserProcessImpl::OnAutoupdateTimer() { |
1101 if (CanAutorestartForUpdate()) { | 1101 if (CanAutorestartForUpdate()) { |
1102 DLOG(WARNING) << "Detected update. Restarting browser."; | 1102 DLOG(WARNING) << "Detected update. Restarting browser."; |
1103 RestartBackgroundInstance(); | 1103 RestartBackgroundInstance(); |
1104 } | 1104 } |
1105 } | 1105 } |
1106 | 1106 |
1107 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1107 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |