Merge r33241 to the 249 branch....

chrome/browser/browser.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/browser/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/gfx/point.h"
@@ skipping 1317 matching lines @@
 #if defined(OS_MACOSX)
   // This really belongs in platform code, but there's no good place to
   // initialize it between the time when the AppController is created
   // (where there's no profile) and the time the controller gets another
   // crack at the start of the main event loop. By that time, BrowserInit
   // has already created the browser window, and it's too late: we need the
   // pref to be already initialized. Doing it here also saves us from having
   // to hard-code pref registration in the several unit tests that use
   // this preference.
   prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false);
+  prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
 #endif
   prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, L"");
   prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
   prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
   prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
   prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
   prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
   prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
   prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
   prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
@@ skipping 1681 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }