chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc - Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl

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

Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge + move method definition Created 7 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/ui/webui/chromeos/login/signin_screen_handler.cc

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

index 9bf04d65bee56498ae56170d7453251a64809705..eed4df7b0c041afd3517c62bb2b3973426f05683 100644

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

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

@@ -7,6 +7,7 @@

#include "base/callback.h"

#include "base/command_line.h"

#include "base/logging.h"

+#include "base/memory/scoped_ptr.h"

#include "base/metrics/histogram.h"

#include "base/prefs/pref_service.h"

#include "base/string16.h"

@@ -1081,9 +1082,10 @@ void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() {

const CommandLine* command_line = CommandLine::ForCurrentProcess();

if (!command_line->HasSwitch(::switches::kEnableManagedUsers))

return;

+ scoped_ptr<DictionaryValue> params(new DictionaryValue());

LoginDisplayHostImpl::default_host()->

StartWizard(WizardController::kLocallyManagedUserCreationScreenName,

- NULL);

+ params.Pass());

}

void SigninScreenHandler::HandleLaunchPublicAccount(