chrome/browser/chromeos/login/eula_view.cc - Issue 6893052: Make customization documents singletons.

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

Issue 6893052: Make customization documents singletons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments resolved 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:

Index: chrome/browser/chromeos/login/eula_view.cc

diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc

index 6201ac57bc0bd9e21e6f41295da83b802bd8837d..d58238f12b924b1cc0e9d22e980796ef0e3aa093 100644

--- a/chrome/browser/chromeos/login/eula_view.cc

+++ b/chrome/browser/chromeos/login/eula_view.cc

@@ -320,8 +320,8 @@ static void SetUpGridLayout(views::GridLayout* layout) {

// displayed using current locale and manifest. Returns empty URL otherwise.

static GURL GetOemEulaPagePath() {

const StartupCustomizationDocument* customization =

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

- if (customization) {

+ StartupCustomizationDocument::GetInstance();

+ if (customization->IsReady()) {

std::string locale = customization->initial_locale();

std::string eula_page = customization->GetEULAPage(locale);

if (!eula_page.empty())