chrome/browser/ui/webui/chromeos/register_page_ui.cc - Issue 6902107: Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

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

Issue 6902107: Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest (Closed) Base URL: svn://svn.chromium.org/chrome/branches/742/src/

Patch Set: Created 9 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/chromeos/register_page_ui.cc

===================================================================

--- chrome/browser/ui/webui/chromeos/register_page_ui.cc (revision 83304)

+++ chrome/browser/ui/webui/chromeos/register_page_ui.cc (working copy)

@@ -219,10 +219,11 @@

void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) {

#if defined(OS_CHROMEOS)

+ chromeos::StartupCustomizationDocument* customization =

+ chromeos::StartupCustomizationDocument::GetInstance();

if (WizardController::default_controller() &&

- WizardController::default_controller()->GetCustomization()) {

- const std::string& url = WizardController::default_controller()->

- GetCustomization()->registration_url();

+ customization->IsReady()) {

+ const std::string& url = customization->registration_url();

VLOG(1) << "Loading registration form with URL: " << url;

GURL register_url(url);

if (!register_url.is_valid()) {

« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »