chrome/browser/ui/webui/chromeos/login/oobe_ui.cc - Issue 491263002: UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted.

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/oobe_ui.cc

Issue 491263002: UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ShowAndCancelTest fixed. Created 6 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

index c6fd45bac9b8fca4d7275929daa5248215979c17..b8af152b09a79c8b1b2118ba4383e5fd7a33e82b 100644

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

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

@@ -264,7 +264,8 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)

g_browser_process->platform_part()->browser_policy_connector_chromeos()->

GetConsumerManagementService();

gaia_screen_handler_ =

- new GaiaScreenHandler(network_state_informer_, consumer_management);

+ new GaiaScreenHandler(

+ core_handler_, network_state_informer_, consumer_management);

AddScreenHandler(gaia_screen_handler_);

signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,