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

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen.cc

Issue 296713003: Make sure that OOBE resumes at the update screen when update was done. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed the test. Created 6 years, 7 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 | « no previous file | chrome/browser/chromeos/login/screens/update_screen_browsertest.cc » ('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/chromeos/login/screens/update_screen.h" 5 #include "chrome/browser/chromeos/login/screens/update_screen.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 break; 183 break;
184 case UpdateEngineClient::UPDATE_STATUS_FINALIZING: 184 case UpdateEngineClient::UPDATE_STATUS_FINALIZING:
185 MakeSureScreenIsShown(); 185 MakeSureScreenIsShown();
186 actor_->SetProgress(kBeforeFinalizingProgress); 186 actor_->SetProgress(kBeforeFinalizingProgress);
187 actor_->SetProgressMessage( 187 actor_->SetProgressMessage(
188 UpdateScreenActor::PROGRESS_MESSAGE_FINALIZING); 188 UpdateScreenActor::PROGRESS_MESSAGE_FINALIZING);
189 actor_->ShowProgressMessage(true); 189 actor_->ShowProgressMessage(true);
190 break; 190 break;
191 case UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT: 191 case UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT:
192 MakeSureScreenIsShown(); 192 MakeSureScreenIsShown();
193 // Make sure that first OOBE stage won't be shown after reboot.
194 StartupUtils::MarkOobeCompleted();
195 actor_->SetProgress(kProgressComplete); 193 actor_->SetProgress(kProgressComplete);
196 actor_->ShowEstimatedTimeLeft(false); 194 actor_->ShowEstimatedTimeLeft(false);
197 if (HasCriticalUpdate()) { 195 if (HasCriticalUpdate()) {
198 actor_->ShowCurtain(false); 196 actor_->ShowCurtain(false);
199 VLOG(1) << "Initiate reboot after update"; 197 VLOG(1) << "Initiate reboot after update";
200 DBusThreadManager::Get()->GetUpdateEngineClient()->RebootAfterUpdate(); 198 DBusThreadManager::Get()->GetUpdateEngineClient()->RebootAfterUpdate();
201 reboot_timer_.Start(FROM_HERE, 199 reboot_timer_.Start(FROM_HERE,
202 base::TimeDelta::FromSeconds(reboot_check_delay_), 200 base::TimeDelta::FromSeconds(reboot_check_delay_),
203 this, 201 this,
204 &UpdateScreen::OnWaitForRebootTimeElapsed); 202 &UpdateScreen::OnWaitForRebootTimeElapsed);
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY, 512 GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
515 std::string()); 513 std::string());
516 break; 514 break;
517 default: 515 default:
518 NOTREACHED(); 516 NOTREACHED();
519 break; 517 break;
520 } 518 }
521 } 519 }
522 520
523 } // namespace chromeos 521 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/update_screen_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698