chrome/common/pref_names.h - Issue 24930003: Migrate startup URLs pref.

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/common/pref_names.h

Issue 24930003: Migrate startup URLs pref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Nicolas' nit, Greg's feedback. Created 7 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:

Index: chrome/common/pref_names.h

diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h

index 6493e720b6ca1807d3adfbb21c58d9012bcac658..aad729cea62fc885ef3f67ef0914b7285565a31b 100644

--- a/chrome/common/pref_names.h

+++ b/chrome/common/pref_names.h

@@ -31,7 +31,11 @@ extern const char kRestoreOnStartupMigrated[];

extern const char kSessionExitedCleanly[];

extern const char kSessionExitType[];

extern const char kURLsToRestoreOnStartup[];

+extern const char kURLsToRestoreOnStartupOld[];

+extern const char kRestoreStartupURLsMigrated[];

extern const char kForceEphemeralProfiles[];

+extern const char kURLsToRestoreOnStartupOld[];

grt (UTC plus 2) 2013/10/07 20:15:16 is there an echo in here?

robertshield 2013/10/08 01:52:13 here here here... ugh, merge splatter, thanks fo

+extern const char kRestoreStartupURLsMigrated[];

// For OS_CHROMEOS we maintain kApplicationLocale property in both local state

// and user's profile. Global property determines locale of login screen,