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

Unified Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index 8b36b2c9a338f47f987fee11fb85b8da118d4bff..a3d2d3ad9dcb3a0054074095b8b2d86e5e4b7a7a 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -17,7 +17,6 @@
#include "base/sequenced_task_runner.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/policy/app_pack_updater.h"
#include "chrome/browser/chromeos/policy/consumer_management_service.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
@@ -198,12 +197,6 @@ void BrowserPolicyConnectorChromeOS::Init(
device_local_account_policy_service_->Connect(device_management_service());
device_cloud_policy_invalidator_.reset(new DeviceCloudPolicyInvalidator);
- // request_context is NULL in unit tests.
- if (request_context.get() && install_attributes_) {
- app_pack_updater_.reset(
- new AppPackUpdater(request_context.get(), install_attributes_.get()));
- }
-
SetTimezoneIfPolicyAvailable();
network_configuration_updater_ =
@@ -227,10 +220,6 @@ void BrowserPolicyConnectorChromeOS::Shutdown() {
// Verify that PreShutdown() has been called first.
DCHECK(!device_cloud_policy_invalidator_);
- // The AppPackUpdater may be observing the |device_cloud_policy_manager_|.
- // Delete it first.
- app_pack_updater_.reset();
-
network_configuration_updater_.reset();
if (device_local_account_policy_service_)
@@ -285,10 +274,6 @@ UserAffiliation BrowserPolicyConnectorChromeOS::GetUserAffiliation(
return USER_AFFILIATION_NONE;
}
-AppPackUpdater* BrowserPolicyConnectorChromeOS::GetAppPackUpdater() {
- return app_pack_updater_.get();
-}
-
void BrowserPolicyConnectorChromeOS::SetUserPolicyDelegate(
ConfigurationPolicyProvider* user_policy_provider) {
global_user_cloud_policy_provider_->SetDelegate(user_policy_provider);

Powered by Google App Engine
This is Rietveld 408576698