chrome/browser/chromeos/login/screens/update_screen.cc - Issue 14362031: Move part of WizardController static code to StartupUtils

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/screens/update_screen.cc

Issue 14362031: Move part of WizardController static code to StartupUtils (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fighting with whitespaces again Created 7 years, 8 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:

Index: chrome/browser/chromeos/login/screens/update_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc

index 33b76be93cdf2d710ea355256066ef3b29f94475..b9dbdaf15844022e3d7b63d79349e8e76b877c50 100644

--- a/chrome/browser/chromeos/login/screens/update_screen.cc

+++ b/chrome/browser/chromeos/login/screens/update_screen.cc

@@ -16,6 +16,7 @@

#include "chrome/browser/chromeos/login/screens/error_screen.h"

#include "chrome/browser/chromeos/login/screens/screen_observer.h"

#include "chrome/browser/chromeos/login/screens/update_screen_actor.h"

+#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/dbus/dbus_thread_manager.h"

@@ -205,7 +206,7 @@ void UpdateScreen::UpdateStatusChanged(

case UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT:

MakeSureScreenIsShown();

// Make sure that first OOBE stage won't be shown after reboot.

- WizardController::MarkOobeCompleted();

+ StartupUtils::MarkOobeCompleted();

actor_->SetProgress(kProgressComplete);

actor_->ShowEstimatedTimeLeft(false);

if (HasCriticalUpdate()) {