chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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

« no previous file with comments | « chrome/browser/extensions/extension_info_private_api_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/register_page_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

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

--- chrome/browser/prefs/browser_prefs.cc (revision 83304)

+++ chrome/browser/prefs/browser_prefs.cc (working copy)

@@ -69,7 +69,7 @@

#if defined(OS_CHROMEOS)

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

-#include "chrome/browser/chromeos/login/apply_services_customization.h"

+#include "chrome/browser/chromeos/customization_document.h"

#include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

@@ -113,7 +113,7 @@

chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);

WizardController::RegisterPrefs(local_state);

chromeos::InputMethodMenu::RegisterPrefs(local_state);

- chromeos::ApplyServicesCustomization::RegisterPrefs(local_state);

+ chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);

chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);

#endif

}