Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/common/chrome_switches.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/browser/ui/webui/sync_setup_handler.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // Defines all the command-line switches used by Chrome. 5 // Defines all the command-line switches used by Chrome.
6 6
7 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_ 7 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_
8 #define CHROME_COMMON_CHROME_SWITCHES_H_ 8 #define CHROME_COMMON_CHROME_SWITCHES_H_
9 #pragma once 9 #pragma once
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 extern const char kDisableSSL3[]; 95 extern const char kDisableSSL3[];
96 extern const char kDisableSync[]; 96 extern const char kDisableSync[];
97 extern const char kDisableSyncApps[]; 97 extern const char kDisableSyncApps[];
98 extern const char kDisableSyncAutofill[]; 98 extern const char kDisableSyncAutofill[];
99 extern const char kDisableSyncAutofillProfile[]; 99 extern const char kDisableSyncAutofillProfile[];
100 extern const char kDisableSyncBookmarks[]; 100 extern const char kDisableSyncBookmarks[];
101 extern const char kDisableSyncEncryption[]; 101 extern const char kDisableSyncEncryption[];
102 extern const char kDisableSyncExtensions[]; 102 extern const char kDisableSyncExtensions[];
103 extern const char kDisableSyncPasswords[]; 103 extern const char kDisableSyncPasswords[];
104 extern const char kDisableSyncPreferences[]; 104 extern const char kDisableSyncPreferences[];
105 extern const char kDisableSyncSearchEngines[];
105 extern const char kDisableSyncThemes[]; 106 extern const char kDisableSyncThemes[];
106 extern const char kDisableSyncTypedUrls[]; 107 extern const char kDisableSyncTypedUrls[];
107 extern const char kDisableTabCloseableStateWatcher[]; 108 extern const char kDisableTabCloseableStateWatcher[];
108 extern const char kDisableTLS1[]; 109 extern const char kDisableTLS1[];
109 extern const char kDisableTranslate[]; 110 extern const char kDisableTranslate[];
110 extern const char kDisableWebResources[]; 111 extern const char kDisableWebResources[];
111 extern const char kDisableWebSecurity[]; 112 extern const char kDisableWebSecurity[];
112 extern const char kDisableXSSAuditor[]; 113 extern const char kDisableXSSAuditor[];
113 extern const char kDiskCacheDir[]; 114 extern const char kDiskCacheDir[];
114 extern const char kDiskCacheSize[]; 115 extern const char kDiskCacheSize[];
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 extern const char kEnablePlatformApps[]; 150 extern const char kEnablePlatformApps[];
150 extern const char kEnablePreconnect[]; 151 extern const char kEnablePreconnect[];
151 extern const char kEnableResourceContentSettings[]; 152 extern const char kEnableResourceContentSettings[];
152 extern const char kEnableSdch[]; 153 extern const char kEnableSdch[];
153 extern const char kEnableSearchProviderApiV2[]; 154 extern const char kEnableSearchProviderApiV2[];
154 extern const char kEnableSmoothScrolling[]; 155 extern const char kEnableSmoothScrolling[];
155 // TODO(kalman): Add to about:flags when UI for syncing extension settings has 156 // TODO(kalman): Add to about:flags when UI for syncing extension settings has
156 // been figured out. 157 // been figured out.
157 extern const char kEnableSyncExtensionSettings[]; 158 extern const char kEnableSyncExtensionSettings[];
158 extern const char kEnableSyncOAuth[]; 159 extern const char kEnableSyncOAuth[];
159 extern const char kEnableSyncSearchEngines[];
160 extern const char kEnableSyncTabs[]; 160 extern const char kEnableSyncTabs[];
161 extern const char kEnableSyncTabsForOtherClients[]; 161 extern const char kEnableSyncTabsForOtherClients[];
162 extern const char kEnableSyncAppNotifications[]; 162 extern const char kEnableSyncAppNotifications[];
163 extern const char kEnableSyncedBookmarksFolder[]; 163 extern const char kEnableSyncedBookmarksFolder[];
164 extern const char kEnableTracking[]; 164 extern const char kEnableTracking[];
165 extern const char kEnableTabGroupsContextMenu[]; 165 extern const char kEnableTabGroupsContextMenu[];
166 extern const char kEnableTopSites[]; 166 extern const char kEnableTopSites[];
167 extern const char kEnableWatchdog[]; 167 extern const char kEnableWatchdog[];
168 extern const char kEnableWebSocketOverSpdy[]; 168 extern const char kEnableWebSocketOverSpdy[];
169 extern const char kEnableWebUITaskManager[]; 169 extern const char kEnableWebUITaskManager[];
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 bool IsPrintPreviewEnabled(); 376 bool IsPrintPreviewEnabled();
377 377
378 bool IsInBrowserThumbnailingEnabled(); 378 bool IsInBrowserThumbnailingEnabled();
379 379
380 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in 380 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
381 // alphabetical order, or in one of the ifdefs (also in order in each section). 381 // alphabetical order, or in one of the ifdefs (also in order in each section).
382 382
383 } // namespace switches 383 } // namespace switches
384 384
385 #endif // CHROME_COMMON_CHROME_SWITCHES_H_ 385 #endif // CHROME_COMMON_CHROME_SWITCHES_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/sync_setup_handler.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698