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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

Issue 463053002: Flag for rollback feature switched to covering by default state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tests adapted for flag add. Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/login/reset_browsertest.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/chromeos/login/reset_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 void ResetScreenHandler::ChooseAndApplyShowScenario() { 102 void ResetScreenHandler::ChooseAndApplyShowScenario() {
103 PrefService* prefs = g_browser_process->local_state(); 103 PrefService* prefs = g_browser_process->local_state();
104 restart_required_ = !CommandLine::ForCurrentProcess()->HasSwitch( 104 restart_required_ = !CommandLine::ForCurrentProcess()->HasSwitch(
105 switches::kFirstExecAfterBoot); 105 switches::kFirstExecAfterBoot);
106 reboot_was_requested_ = false; 106 reboot_was_requested_ = false;
107 rollback_available_ = false; 107 rollback_available_ = false;
108 preparing_for_rollback_ = false; 108 preparing_for_rollback_ = false;
109 if (!restart_required_) // First exec after boot. 109 if (!restart_required_) // First exec after boot.
110 reboot_was_requested_ = prefs->GetBoolean(prefs::kFactoryResetRequested); 110 reboot_was_requested_ = prefs->GetBoolean(prefs::kFactoryResetRequested);
111 111
112 if (CommandLine::ForCurrentProcess()->HasSwitch( 112 if (!CommandLine::ForCurrentProcess()->HasSwitch(
113 switches::kDisableRollbackOption)) { 113 switches::kEnableRollbackOption)) {
114 rollback_available_ = false; 114 rollback_available_ = false;
115 ShowWithParams(); 115 ShowWithParams();
116 } else if (!restart_required_ && reboot_was_requested_) { 116 } else if (!restart_required_ && reboot_was_requested_) {
117 // First exec after boot. 117 // First exec after boot.
118 PrefService* prefs = g_browser_process->local_state(); 118 PrefService* prefs = g_browser_process->local_state();
119 rollback_available_ = prefs->GetBoolean(prefs::kRollbackRequested); 119 rollback_available_ = prefs->GetBoolean(prefs::kRollbackRequested);
120 ShowWithParams(); 120 ShowWithParams();
121 } else { 121 } else {
122 chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()-> 122 chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->
123 CanRollbackCheck(base::Bind(&ResetScreenHandler::OnRollbackCheck, 123 CanRollbackCheck(base::Bind(&ResetScreenHandler::OnRollbackCheck,
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 base::DictionaryValue params; 263 base::DictionaryValue params;
264 params.SetInteger("uiState", kErrorUIStateRollback); 264 params.SetInteger("uiState", kErrorUIStateRollback);
265 ShowScreen(OobeUI::kScreenErrorMessage, &params); 265 ShowScreen(OobeUI::kScreenErrorMessage, &params);
266 } else if (status.status == 266 } else if (status.status ==
267 UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) { 267 UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
268 DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); 268 DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
269 } 269 }
270 } 270 }
271 271
272 } // namespace chromeos 272 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/reset_browsertest.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698