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

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

Issue 814123006: Revert of Implemented consumer management unenrollment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dcpm
Patch Set: Created 5 years, 11 months 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/device_cloud_policy_manager_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
index 3ff9c738e53a630ef15577000d30063f34878394..7d4d2ee485c562aa29fdb76129e7958db334251d 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -6,9 +6,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/callback.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/port.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
@@ -25,8 +23,6 @@
#include "chromeos/chromeos_constants.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/system/statistics_provider.h"
-#include "components/policy/core/common/cloud/cloud_policy_core.h"
-#include "components/policy/core/common/cloud/cloud_policy_service.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "content/public/browser/browser_thread.h"
#include "crypto/sha2.h"
@@ -252,24 +248,6 @@
NotifyConnected();
}
-void DeviceCloudPolicyManagerChromeOS::Unregister(
- const UnregisterCallback& callback) {
- if (!service()) {
- LOG(ERROR) << "Tried to unregister but DeviceCloudPolicyManagerChromeOS is "
- << "not connected.";
- callback.Run(false);
- return;
- }
-
- service()->Unregister(callback);
-}
-
-void DeviceCloudPolicyManagerChromeOS::Disconnect() {
- core()->Disconnect();
-
- NotifyDisconnected();
-}
-
void DeviceCloudPolicyManagerChromeOS::OnStateKeysUpdated() {
if (client() && ForcedReEnrollmentEnabled())
client()->SetStateKeysToUpload(state_keys_broker_->state_keys());
@@ -312,9 +290,4 @@
Observer, observers_, OnDeviceCloudPolicyManagerConnected());
}
-void DeviceCloudPolicyManagerChromeOS::NotifyDisconnected() {
- FOR_EACH_OBSERVER(
- Observer, observers_, OnDeviceCloudPolicyManagerDisconnected());
-}
-
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698