Index: chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc |
index 5e929095c25845510f586b4c8308b4dc99626fed..4ae16a7dd3e869e5d20ade998a776d5c7c2d8e93 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc |
@@ -14,6 +14,7 @@ |
#include "chrome/browser/chromeos/login/help_app_launcher.h" |
#include "chrome/browser/chromeos/reset/metrics.h" |
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
+#include "chrome/common/chrome_switches.h" |
#include "chrome/common/pref_names.h" |
#include "chromeos/chromeos_switches.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
@@ -101,11 +102,7 @@ |
rollback_available_ = false; |
if (!restart_required_) // First exec after boot. |
reboot_was_requested_ = prefs->GetBoolean(prefs::kFactoryResetRequested); |
- if (!CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableRollbackOption)) { |
- rollback_available_ = false; |
- ShowWithParams(); |
- } else if (!restart_required_ && reboot_was_requested_) { |
+ if (!restart_required_ && reboot_was_requested_) { |
// First exec after boot. |
rollback_available_ = prefs->GetBoolean(prefs::kRollbackRequested); |
ShowWithParams(); |
@@ -234,7 +231,6 @@ |
void ResetScreenHandler::UpdateStatusChanged( |
const UpdateEngineClient::Status& status) { |
- VLOG(1) << "Update status change to " << status.status; |
if (status.status == UpdateEngineClient::UPDATE_STATUS_ERROR) { |
// Show error screen. |
base::DictionaryValue params; |