chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc - Issue 305153002: Fix for flag-file covering Rollback reset option.

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/ui/webui/chromeos/login/reset_screen_handler.cc

Issue 305153002: Fix for flag-file covering Rollback reset option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

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 71ed4c28d8834a18f63c69bd4b9c68c2aa18171b..6a3ba7d22831202447f4e466ec9b90465000092d 100644

--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

@@ -140,7 +140,7 @@ void ResetScreenHandler::ChooseAndApplyShowScenario() {

void ResetScreenHandler::OnRollbackFlagFileCheckDone(

scoped_ptr<bool> file_exists) {

- if (!file_exists && !CommandLine::ForCurrentProcess()->HasSwitch(

+ if (!(*file_exists.get()) && !CommandLine::ForCurrentProcess()->HasSwitch(

dzhioev (left Google) 2014/05/30 09:27:38 nit: .get() is not needed.

switches::kEnableRollbackOption)) {

rollback_available_ = false;

ShowWithParams();

« no previous file with comments | « no previous file | no next file » | no next file with comments »