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

Side by Side 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:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/prefs/session_startup_pref.cc ('K') | « chrome/browser/prefs/session_startup_pref.cc ('k') | chrome/common/pref_names.cc » ('j') | chrome/common/pref_names.cc » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // Constants for the names of various preferences, for easier changing.	5 // Constants for the names of various preferences, for easier changing.

6	6

7 #ifndef CHROME_COMMON_PREF_NAMES_H_	7 #ifndef CHROME_COMMON_PREF_NAMES_H_

8 #define CHROME_COMMON_PREF_NAMES_H_	8 #define CHROME_COMMON_PREF_NAMES_H_

9	9

10 #include <stddef.h>	10 #include <stddef.h>

(...skipping 13 matching lines...) Expand all Loading...
24 extern const char kManagedModeManualHosts[];	24 extern const char kManagedModeManualHosts[];

25 extern const char kManagedModeManualURLs[];	25 extern const char kManagedModeManualURLs[];

26 extern const char kManagedUserCustodianEmail[];	26 extern const char kManagedUserCustodianEmail[];

27 extern const char kManagedUserCustodianName[];	27 extern const char kManagedUserCustodianName[];

28 extern const char kProfileIconVersion[];	28 extern const char kProfileIconVersion[];

29 extern const char kRestoreOnStartup[];	29 extern const char kRestoreOnStartup[];

30 extern const char kRestoreOnStartupMigrated[];	30 extern const char kRestoreOnStartupMigrated[];

31 extern const char kSessionExitedCleanly[];	31 extern const char kSessionExitedCleanly[];

32 extern const char kSessionExitType[];	32 extern const char kSessionExitType[];

33 extern const char kURLsToRestoreOnStartup[];	33 extern const char kURLsToRestoreOnStartup[];

	34 extern const char kURLsToRestoreOnStartupOld[];

	35 extern const char kRestoreStartupURLsMigrated[];

34 extern const char kForceEphemeralProfiles[];	36 extern const char kForceEphemeralProfiles[];

	37 extern const char kURLsToRestoreOnStartupOld[];
	grt (UTC plus 2) 2013/10/07 20:15:16 is there an echo in here? is there an echo in here? robertshield 2013/10/08 01:52:13 here here here... ugh, merge splatter, thanks fo Show quoted text On 2013/10/07 20:15:16, grt wrote: > is there an echo in here? here here here... ugh, merge splatter, thanks for catching.
	38 extern const char kRestoreStartupURLsMigrated[];

35	39

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

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

38 // while user's profile determines his personal locale preference.	42 // while user's profile determines his personal locale preference.

39 extern const char kApplicationLocale[];	43 extern const char kApplicationLocale[];

40 #if defined(OS_CHROMEOS)	44 #if defined(OS_CHROMEOS)

41 extern const char kApplicationLocaleBackup[];	45 extern const char kApplicationLocaleBackup[];

42 extern const char kApplicationLocaleAccepted[];	46 extern const char kApplicationLocaleAccepted[];

43 extern const char kOwnerLocale[];	47 extern const char kOwnerLocale[];

44 #endif	48 #endif

(...skipping 888 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
933	937

934 extern const char kWatchdogExtensionActive[];	938 extern const char kWatchdogExtensionActive[];

935	939

936 extern const char kProfilePreferenceHashes[];	940 extern const char kProfilePreferenceHashes[];

937	941

938 extern const char kNetworkTimeMapping[];	942 extern const char kNetworkTimeMapping[];

939	943

940 } // namespace prefs	944 } // namespace prefs

941	945

942 #endif // CHROME_COMMON_PREF_NAMES_H_	946 #endif // CHROME_COMMON_PREF_NAMES_H_

OLD	NEW