diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/common/pref_names.h | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/common/pref_names.h')
| -rw-r--r-- | chrome/common/pref_names.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index ea7c959..7f7acdc 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -13,6 +13,8 @@ namespace prefs { // Profile prefs +extern const char kAppsPromoCounter[]; +extern const char kDefaultAppsInstalled[]; extern const char kHomePageIsNewTabPage[]; extern const char kHomePage[]; extern const char kSessionExitedCleanly[]; @@ -52,8 +54,10 @@ extern const char kFormAutofillEnabled[]; // OBSOLETE extern const char kSafeBrowsingEnabled[]; extern const char kSearchSuggestEnabled[]; extern const char kCookieBehavior[]; // OBSOLETE +extern const char kDefaultSearchProviderEnabled[]; extern const char kDefaultSearchProviderSearchURL[]; extern const char kDefaultSearchProviderSuggestURL[]; +extern const char kDefaultSearchProviderInstantURL[]; extern const char kDefaultSearchProviderIconURL[]; extern const char kDefaultSearchProviderEncodings[]; extern const char kDefaultSearchProviderName[]; @@ -67,7 +71,10 @@ extern const char kAlternateErrorPagesEnabled[]; extern const char kDnsPrefetchingEnabled[]; extern const char kDnsStartupPrefetchList[]; extern const char kDnsHostReferralList[]; +extern const char kDisableSpdy[]; extern const char kCookiePromptExpanded[]; +extern const char kInstantConfirmDialogShown[]; +extern const char kInstantEnabled[]; #if defined(USE_NSS) extern const char kCertRevocationCheckingEnabled[]; extern const char kSSL2Enabled[]; @@ -140,6 +147,7 @@ extern const char kAccessibilityEnabled[]; extern const char kLabsAdvancedFilesystemEnabled[]; extern const char kLabsMediaplayerEnabled[]; extern const char kLabsTalkEnabled[]; +extern const char kEnableScreenLock[]; #endif extern const char kIpcDisabledMessages[]; extern const char kShowHomeButton[]; @@ -154,6 +162,7 @@ extern const char kDeleteFormData[]; extern const char kEnableSpellCheck[]; extern const char kEnabledLabsExperiments[]; extern const char kEnableAutoSpellCorrect[]; +extern const char kSavingBrowserHistoryDisabled[]; extern const char kDeleteTimePeriod[]; extern const char kPrintingEnabled[]; extern const char kPrintingPageHeaderLeft[]; @@ -199,6 +208,7 @@ extern const char kAutoFillAuxiliaryProfilesEnabled[]; extern const char kAutoFillDialogPlacement[]; extern const char kAutoFillPositiveUploadRate[]; extern const char kAutoFillNegativeUploadRate[]; +extern const char kAutoFillPersonalDataManagerFirstRun[]; extern const char kUseVerticalTabs[]; extern const char kEnableTranslate[]; |