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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry()); | 631 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry()); |
632 return media_file_system_registry_.get(); | 632 return media_file_system_registry_.get(); |
633 } | 633 } |
634 | 634 |
635 #if !defined(OS_WIN) | 635 #if !defined(OS_WIN) |
636 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing( | 636 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing( |
637 const CommandLine& command_line) { | 637 const CommandLine& command_line) { |
638 } | 638 } |
639 #endif | 639 #endif |
640 | 640 |
| 641 bool BrowserProcessImpl::created_local_state() const { |
| 642 return created_local_state_; |
| 643 } |
| 644 |
641 // static | 645 // static |
642 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 646 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
643 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 647 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
644 false); | 648 false); |
645 // This policy needs to be defined before the net subsystem is initialized, | 649 // This policy needs to be defined before the net subsystem is initialized, |
646 // so we do it here. | 650 // so we do it here. |
647 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, | 651 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, |
648 net::kDefaultMaxSocketsPerProxyServer); | 652 net::kDefaultMaxSocketsPerProxyServer); |
649 | 653 |
650 // This is observed by ChildProcessSecurityPolicy, which lives in content/ | 654 // This is observed by ChildProcessSecurityPolicy, which lives in content/ |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1048 } | 1052 } |
1049 | 1053 |
1050 void BrowserProcessImpl::OnAutoupdateTimer() { | 1054 void BrowserProcessImpl::OnAutoupdateTimer() { |
1051 if (CanAutorestartForUpdate()) { | 1055 if (CanAutorestartForUpdate()) { |
1052 DLOG(WARNING) << "Detected update. Restarting browser."; | 1056 DLOG(WARNING) << "Detected update. Restarting browser."; |
1053 RestartBackgroundInstance(); | 1057 RestartBackgroundInstance(); |
1054 } | 1058 } |
1055 } | 1059 } |
1056 | 1060 |
1057 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1061 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |