chrome/common/pref_names.h - Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

Side by Side Diff: chrome/common/pref_names.h

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Merge to TOT and fixed additional conflicts from rsimha. Created 9 years, 1 month 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

« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #pragma once	9 #pragma once

10	10

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 extern const char kWebKitAllowRunningInsecureContent[];	103 extern const char kWebKitAllowRunningInsecureContent[];

104 extern const char kPasswordManagerEnabled[];	104 extern const char kPasswordManagerEnabled[];

105 extern const char kPasswordManagerAllowShowPasswords[];	105 extern const char kPasswordManagerAllowShowPasswords[];

106 extern const char kAutologinEnabled[];	106 extern const char kAutologinEnabled[];

107 extern const char kSafeBrowsingEnabled[];	107 extern const char kSafeBrowsingEnabled[];

108 extern const char kSafeBrowsingReportingEnabled[];	108 extern const char kSafeBrowsingReportingEnabled[];

109 extern const char kIncognitoModeAvailability[];	109 extern const char kIncognitoModeAvailability[];

110 extern const char kSearchSuggestEnabled[];	110 extern const char kSearchSuggestEnabled[];

111 extern const char kConfirmToQuitEnabled[];	111 extern const char kConfirmToQuitEnabled[];

112 extern const char kCookieBehavior[]; // OBSOLETE	112 extern const char kCookieBehavior[]; // OBSOLETE

	113 extern const char kSyncedDefaultSearchProviderGUID[];

113 extern const char kDefaultSearchProviderEnabled[];	114 extern const char kDefaultSearchProviderEnabled[];

114 extern const char kDefaultSearchProviderSearchURL[];	115 extern const char kDefaultSearchProviderSearchURL[];

115 extern const char kDefaultSearchProviderSuggestURL[];	116 extern const char kDefaultSearchProviderSuggestURL[];

116 extern const char kDefaultSearchProviderInstantURL[];	117 extern const char kDefaultSearchProviderInstantURL[];

117 extern const char kDefaultSearchProviderIconURL[];	118 extern const char kDefaultSearchProviderIconURL[];

118 extern const char kDefaultSearchProviderEncodings[];	119 extern const char kDefaultSearchProviderEncodings[];

119 extern const char kDefaultSearchProviderName[];	120 extern const char kDefaultSearchProviderName[];

120 extern const char kDefaultSearchProviderKeyword[];	121 extern const char kDefaultSearchProviderKeyword[];

121 extern const char kDefaultSearchProviderID[];	122 extern const char kDefaultSearchProviderID[];

122 extern const char kDefaultSearchProviderPrepopulateID[];	123 extern const char kDefaultSearchProviderPrepopulateID[];

(...skipping 484 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
607	608

608 extern const char kDevicePolicyRefreshRate[];	609 extern const char kDevicePolicyRefreshRate[];

609 extern const char kUserPolicyRefreshRate[];	610 extern const char kUserPolicyRefreshRate[];

610	611

611 extern const char kRecoveryComponentVersion[];	612 extern const char kRecoveryComponentVersion[];

612 extern const char kComponentUpdaterState[];	613 extern const char kComponentUpdaterState[];

613	614

614 } // namespace prefs	615 } // namespace prefs

615	616

616 #endif // CHROME_COMMON_PREF_NAMES_H_	617 #endif // CHROME_COMMON_PREF_NAMES_H_

OLD	NEW