chrome/browser/chromeos/login/wizard_controller.h - Issue 1107363002: Merge M43: Fix crash on Enrollment screen.

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/wizard_controller.h

Issue 1107363002: Merge M43: Fix crash on Enrollment screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357

Patch Set: Created 5 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/wizard_controller.h

diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h

index 0a4b8c6d66d51653f2a70469bb0e1a1d168ea312..9f0d83000e981234a48f97a740f901945819323b 100644

--- a/chrome/browser/chromeos/login/wizard_controller.h

+++ b/chrome/browser/chromeos/login/wizard_controller.h

@@ -133,6 +133,7 @@ class WizardController : public BaseScreenDelegate,

bool login_screen_started() const { return login_screen_started_; }

// ScreenManager implementation.

+ BaseScreen* GetScreen(const std::string& screen_name) override;

BaseScreen* CreateScreen(const std::string& screen_name) override;

static const char kNetworkScreenName[];