Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

chrome/common/pref_names.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/basictypes.h"
 
 namespace prefs {
 
@@ skipping 237 matching lines @@
 const char kConfirmToQuitEnabled[] = "browser.confirm_to_quit";
 
 // OBSOLETE.  Enum that specifies whether to enforce a third-party cookie
 // blocking policy.  This has been superseded by kDefaultContentSettings +
 // kBlockThirdPartyCookies.
 // 0 - allow all cookies.
 // 1 - block third-party cookies
 // 2 - block all cookies
 const char kCookieBehavior[] = "security.cookie_behavior";
 
+// The GUID of the synced default search provider. Note that this acts like a
+// pointer to which synced search engine should be the default, rather than the
+// prefs below which describe the locally saved default search provider details
+// (and are not synced).

[Nicolas Zea, 2011/11/04 23:08:06]

Mention that this is ignored (and not affected by) the case of the default
search provider being managed.

[SteveT, 2011/11/07 21:48:56]

Done.

+const char kSyncedDefaultSearchProviderGUID[] =
+    "default_search_provider.synced_guid";
+
+const char kPendingSyncedDefaultSearchProviderChange[] =
+    "default_search_provider.pending_sync_change";
+
 // Whether having a default search provider is enabled.
 const char kDefaultSearchProviderEnabled[] =
     "default_search_provider.enabled";
 
 // The URL (as understood by TemplateURLRef) the default search provider uses
 // for searches.
 const char kDefaultSearchProviderSearchURL[] =
     "default_search_provider.search_url";
 
 // The URL (as understood by TemplateURLRef) the default search provider uses
@@ skipping 1364 matching lines @@
 
 // String that represents the recovery component last downloaded version. This
 // takes the usual 'a.b.c.d' notation.
 const char kRecoveryComponentVersion[] = "recovery_component.version";
 
 // String that stores the component updater last known state. This is used for
 // troubleshooting.
 const char kComponentUpdaterState[] = "component_updater.state";
 
 }  // namespace prefs