chrome/browser/chromeos/login/screen_manager.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/screen_manager.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/screen_manager.h

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

index 7a18ba65a46d66ed6d244dc6956a9cabc359927f..24731261aa53525403def048a5d919dc83c0646b 100644

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

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

@@ -22,7 +22,7 @@ class ScreenManager {

virtual ~ScreenManager();

// Getter for screen with lazy initialization.

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

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

// Factory for screen instances.

virtual BaseScreen* CreateScreen(const std::string& screen_name) = 0;

« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc » ('j') | no next file with comments »