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 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
510 CreateNotificationUIManager(); | 510 CreateNotificationUIManager(); |
511 return notification_ui_manager_.get(); | 511 return notification_ui_manager_.get(); |
512 } | 512 } |
513 | 513 |
514 policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() { | 514 policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() { |
515 DCHECK(CalledOnValidThread()); | 515 DCHECK(CalledOnValidThread()); |
516 if (!created_browser_policy_connector_) { | 516 if (!created_browser_policy_connector_) { |
517 DCHECK(browser_policy_connector_.get() == NULL); | 517 DCHECK(browser_policy_connector_.get() == NULL); |
518 created_browser_policy_connector_ = true; | 518 created_browser_policy_connector_ = true; |
519 #if defined(ENABLE_CONFIGURATION_POLICY) | 519 #if defined(ENABLE_CONFIGURATION_POLICY) |
520 browser_policy_connector_.reset(policy::BrowserPolicyConnector::Create()); | 520 browser_policy_connector_.reset(new policy::BrowserPolicyConnector()); |
| 521 browser_policy_connector_->Init(); |
521 #endif | 522 #endif |
522 } | 523 } |
523 return browser_policy_connector_.get(); | 524 return browser_policy_connector_.get(); |
524 } | 525 } |
525 | 526 |
526 IconManager* BrowserProcessImpl::icon_manager() { | 527 IconManager* BrowserProcessImpl::icon_manager() { |
527 DCHECK(CalledOnValidThread()); | 528 DCHECK(CalledOnValidThread()); |
528 if (!created_icon_manager_) | 529 if (!created_icon_manager_) |
529 CreateIconManager(); | 530 CreateIconManager(); |
530 return icon_manager_.get(); | 531 return icon_manager_.get(); |
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1100 } | 1101 } |
1101 | 1102 |
1102 void BrowserProcessImpl::OnAutoupdateTimer() { | 1103 void BrowserProcessImpl::OnAutoupdateTimer() { |
1103 if (CanAutorestartForUpdate()) { | 1104 if (CanAutorestartForUpdate()) { |
1104 DLOG(WARNING) << "Detected update. Restarting browser."; | 1105 DLOG(WARNING) << "Detected update. Restarting browser."; |
1105 RestartBackgroundInstance(); | 1106 RestartBackgroundInstance(); |
1106 } | 1107 } |
1107 } | 1108 } |
1108 | 1109 |
1109 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1110 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |