summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/session_manager_client.cc
diff options
context:
space:
mode:
authormnissler <mnissler@chromium.org>2014-10-14 09:10:48 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-14 16:11:07 +0000
commitfe709af454a026e3f6b92773d2e813127991138f (patch)
treeb7c064458a9bc78377b00e2c47bd78bb75c83e48 /chromeos/dbus/session_manager_client.cc
parentc1e1f74161297a16dc111f016da39a44202a5036 (diff)
downloadchromium_src-fe709af454a026e3f6b92773d2e813127991138f.zip
chromium_src-fe709af454a026e3f6b92773d2e813127991138f.tar.gz
chromium_src-fe709af454a026e3f6b92773d2e813127991138f.tar.bz2
Revert "If booting for the first time skip auto-enrollment check."
This reverts commit 8212232fac77f4f0335ea8d065960777e955d98e. It has been replaced by a simpler implementation, so this code is no longer necessary. BUG=chromium:397354 Review URL: https://codereview.chromium.org/655553002 Cr-Commit-Position: refs/heads/master@{#299490}
Diffstat (limited to 'chromeos/dbus/session_manager_client.cc')
-rw-r--r--chromeos/dbus/session_manager_client.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index c74de10..5a67ee8 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -525,7 +525,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
void OnGetServerBackedStateKeys(const StateKeysCallback& callback,
dbus::Response* response) {
std::vector<std::string> state_keys;
- bool first_run = false;
if (!response) {
LOG(ERROR) << "Failed to call "
<< login_manager::kSessionManagerStartSession;
@@ -548,14 +547,10 @@ class SessionManagerClientImpl : public SessionManagerClient {
std::string(reinterpret_cast<const char*>(data), size));
}
}
- if (!reader.PopBool(&first_run)) {
- // TODO(tnagel): After 2014-11-19 turn this warning into an error.
- LOG(WARNING) << "Chrome OS is too old. Defaulting to first_run=false.";
- }
}
if (!callback.is_null())
- callback.Run(state_keys, first_run);
+ callback.Run(state_keys);
}
@@ -718,7 +713,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
state_keys.push_back(crypto::SHA256HashString(base::IntToString(i)));
if (!callback.is_null())
- callback.Run(state_keys, false);
+ callback.Run(state_keys);
}
private: