| 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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 #else | 780 #else |
| 781 return nullptr; | 781 return nullptr; |
| 782 #endif | 782 #endif |
| 783 } | 783 } |
| 784 | 784 |
| 785 shell_integration::DefaultWebClientState | 785 shell_integration::DefaultWebClientState |
| 786 BrowserProcessImpl::CachedDefaultWebClientState() { | 786 BrowserProcessImpl::CachedDefaultWebClientState() { |
| 787 return cached_default_web_client_state_; | 787 return cached_default_web_client_state_; |
| 788 } | 788 } |
| 789 | 789 |
| 790 PhysicalWebDataSource* BrowserProcessImpl::GetPhysicalWebDataSource() { | 790 physical_web::PhysicalWebDataSource* |
| 791 BrowserProcessImpl::GetPhysicalWebDataSource() { |
| 791 DCHECK(CalledOnValidThread()); | 792 DCHECK(CalledOnValidThread()); |
| 792 #if defined(OS_ANDROID) | 793 #if defined(OS_ANDROID) |
| 793 if (!physical_web_data_source_) { | 794 if (!physical_web_data_source_) { |
| 794 CreatePhysicalWebDataSource(); | 795 CreatePhysicalWebDataSource(); |
| 795 DCHECK(physical_web_data_source_); | 796 DCHECK(physical_web_data_source_); |
| 796 } | 797 } |
| 797 return physical_web_data_source_.get(); | 798 return physical_web_data_source_.get(); |
| 798 #else | 799 #else |
| 799 return nullptr; | 800 return nullptr; |
| 800 #endif | 801 #endif |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1402 } | 1403 } |
| 1403 | 1404 |
| 1404 void BrowserProcessImpl::OnAutoupdateTimer() { | 1405 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1405 if (CanAutorestartForUpdate()) { | 1406 if (CanAutorestartForUpdate()) { |
| 1406 DLOG(WARNING) << "Detected update. Restarting browser."; | 1407 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1407 RestartBackgroundInstance(); | 1408 RestartBackgroundInstance(); |
| 1408 } | 1409 } |
| 1409 } | 1410 } |
| 1410 | 1411 |
| 1411 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1412 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |