chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h - Issue 647043004: WizardScreen is merged to BaseScreen.

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/supervised/supervised_user_creation_screen.h

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Created 6 years, 2 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/chromeos/login/screens/wrong_hwid_screen.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h

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

index 263d32a0e5cc870aa88d22986a71391018c51c69..a42698868f23c88142e88ed2508161594f2a9a06 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h

@@ -10,7 +10,7 @@

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "chrome/browser/chromeos/camera_presence_notifier.h"

-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"

+#include "chrome/browser/chromeos/login/screens/base_screen.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h"

#include "chrome/browser/image_decoder.h"

#include "chrome/browser/supervised_user/supervised_user_sync_service.h"

@@ -27,7 +27,7 @@ class ScreenManager;

// Class that controls screen showing ui for supervised user creation.

class SupervisedUserCreationScreen

- : public WizardScreen,

+ : public BaseScreen,

public SupervisedUserCreationScreenHandler::Delegate,

public SupervisedUserCreationController::StatusConsumer,

public SupervisedUserSyncServiceObserver,

@@ -74,7 +74,7 @@ class SupervisedUserCreationScreen

virtual void OnSupervisedUsersSyncingStopped() override {}

virtual void OnSupervisedUsersChanged() override;

- // WizardScreen implementation:

+ // BaseScreen implementation:

virtual void PrepareToShow() override;

virtual void Show() override;

virtual void Hide() override;