Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 8586030: Added ConfigurationPolicyProvider::RefreshPolicies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: BrowserPolicyConnector is less static; addressed comments Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 CreateNotificationUIManager(); 514 CreateNotificationUIManager();
515 return notification_ui_manager_.get(); 515 return notification_ui_manager_.get();
516 } 516 }
517 517
518 policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() { 518 policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {
519 DCHECK(CalledOnValidThread()); 519 DCHECK(CalledOnValidThread());
520 if (!created_browser_policy_connector_) { 520 if (!created_browser_policy_connector_) {
521 DCHECK(browser_policy_connector_.get() == NULL); 521 DCHECK(browser_policy_connector_.get() == NULL);
522 created_browser_policy_connector_ = true; 522 created_browser_policy_connector_ = true;
523 #if defined(ENABLE_CONFIGURATION_POLICY) 523 #if defined(ENABLE_CONFIGURATION_POLICY)
524 browser_policy_connector_.reset(policy::BrowserPolicyConnector::Create()); 524 browser_policy_connector_.reset(new policy::BrowserPolicyConnector());
525 browser_policy_connector_->Init();
525 #endif 526 #endif
526 } 527 }
527 return browser_policy_connector_.get(); 528 return browser_policy_connector_.get();
528 } 529 }
529 530
530 IconManager* BrowserProcessImpl::icon_manager() { 531 IconManager* BrowserProcessImpl::icon_manager() {
531 DCHECK(CalledOnValidThread()); 532 DCHECK(CalledOnValidThread());
532 if (!created_icon_manager_) 533 if (!created_icon_manager_)
533 CreateIconManager(); 534 CreateIconManager();
534 return icon_manager_.get(); 535 return icon_manager_.get();
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 } 1151 }
1151 1152
1152 void BrowserProcessImpl::OnAutoupdateTimer() { 1153 void BrowserProcessImpl::OnAutoupdateTimer() {
1153 if (CanAutorestartForUpdate()) { 1154 if (CanAutorestartForUpdate()) {
1154 DLOG(WARNING) << "Detected update. Restarting browser."; 1155 DLOG(WARNING) << "Detected update. Restarting browser.";
1155 RestartBackgroundInstance(); 1156 RestartBackgroundInstance();
1156 } 1157 }
1157 } 1158 }
1158 1159
1159 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1160 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698