| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 #endif | 147 #endif |
| 148 | 148 |
| 149 #if defined(ENABLE_PLUGIN_INSTALLATION) | 149 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 150 #include "chrome/browser/plugins/plugins_resource_service.h" | 150 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 151 #endif | 151 #endif |
| 152 | 152 |
| 153 #if defined(ENABLE_WEBRTC) | 153 #if defined(ENABLE_WEBRTC) |
| 154 #include "chrome/browser/media/webrtc_log_uploader.h" | 154 #include "chrome/browser/media/webrtc_log_uploader.h" |
| 155 #endif | 155 #endif |
| 156 | 156 |
| 157 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | 157 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
| 158 #include "chrome/browser/memory/tab_manager.h" | 158 #include "chrome/browser/memory/tab_manager.h" |
| 159 #endif | 159 #endif |
| 160 | 160 |
| 161 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 161 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 162 #include "chrome/browser/first_run/upgrade_util.h" | 162 #include "chrome/browser/first_run/upgrade_util.h" |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 165 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| 166 // How often to check if the persistent instance of Chrome needs to restart | 166 // How often to check if the persistent instance of Chrome needs to restart |
| 167 // to install an update. | 167 // to install an update. |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 | 736 |
| 737 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { | 737 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { |
| 738 DCHECK(CalledOnValidThread()); | 738 DCHECK(CalledOnValidThread()); |
| 739 if (!gcm_driver_) | 739 if (!gcm_driver_) |
| 740 CreateGCMDriver(); | 740 CreateGCMDriver(); |
| 741 return gcm_driver_.get(); | 741 return gcm_driver_.get(); |
| 742 } | 742 } |
| 743 | 743 |
| 744 memory::TabManager* BrowserProcessImpl::GetTabManager() { | 744 memory::TabManager* BrowserProcessImpl::GetTabManager() { |
| 745 DCHECK(CalledOnValidThread()); | 745 DCHECK(CalledOnValidThread()); |
| 746 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | 746 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
| 747 if (!tab_manager_.get()) | 747 if (!tab_manager_.get()) |
| 748 tab_manager_.reset(new memory::TabManager()); | 748 tab_manager_.reset(new memory::TabManager()); |
| 749 return tab_manager_.get(); | 749 return tab_manager_.get(); |
| 750 #else | 750 #else |
| 751 return nullptr; | 751 return nullptr; |
| 752 #endif | 752 #endif |
| 753 } | 753 } |
| 754 | 754 |
| 755 shell_integration::DefaultWebClientState | 755 shell_integration::DefaultWebClientState |
| 756 BrowserProcessImpl::CachedDefaultWebClientState() { | 756 BrowserProcessImpl::CachedDefaultWebClientState() { |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1283 } | 1283 } |
| 1284 | 1284 |
| 1285 void BrowserProcessImpl::OnAutoupdateTimer() { | 1285 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1286 if (CanAutorestartForUpdate()) { | 1286 if (CanAutorestartForUpdate()) { |
| 1287 DLOG(WARNING) << "Detected update. Restarting browser."; | 1287 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1288 RestartBackgroundInstance(); | 1288 RestartBackgroundInstance(); |
| 1289 } | 1289 } |
| 1290 } | 1290 } |
| 1291 | 1291 |
| 1292 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1292 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |