Merge r33241 to the 249 branch....

chrome/common/pref_names.cc

 // Copyright (c) 2006-2009 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"
 
 namespace prefs {
 
 // *************** PROFILE PREFS ***************
 // These are attached to the user profile
@@ skipping 257 matching lines @@
     L"extensions.theme.properties";
 
 // Boolean pref which persists whether the extensions_ui is in developer mode
 // (showing developer packing tools and extensions details)
 const wchar_t kExtensionsUIDeveloperMode[] = L"extensions.ui.developer_mode";
 
 // Boolean that indicates whether we should check if we are the default browser
 // on start-up.
 const wchar_t kCheckDefaultBrowser[] = L"browser.check_default_browser";
 
+#if defined(OS_MACOSX)
+// Boolean that indicates whether the application should show the info bar
+// asking the user to set up automatic updates when Keystone promotion is
+// required.
+const wchar_t kShowUpdatePromotionInfoBar[] =
+    L"browser.show_update_promotion_info_bar";
+#endif
+
 // Boolean that is false if we should show window manager decorations.  If
 // true, we draw a custom chrome frame (thicker title bar and blue border).
 const wchar_t kUseCustomChromeFrame[] = L"browser.custom_chrome_frame";
 
 // Boolean that indicates whether the infobar explaining that search can be done
 // directly from the omnibox should be shown.
 const wchar_t kShowOmniboxSearchHint[] = L"browser.show_omnibox_search_hint";
 
 // Integer that counts the number of times the promo on the NTP has left to be
 // shown; this decrements each time the NTP is shown for the first time
@@ skipping 297 matching lines @@
 // Integer location of the split bar in the browser view.
 const wchar_t kDevToolsSplitLocation[] = L"devtools.split_location";
 
 // 64-bit integer serialization of the base::Time when the last sync occured.
 const wchar_t kSyncLastSyncedTime[] = L"sync.last_synced_time";
 
 // Boolean specifying whether the user finished setting up sync.
 const wchar_t kSyncHasSetupCompleted[] = L"sync.has_setup_completed";
 
 }  // namespace prefs