Merge 208596 "Pipe a bit down to the InstantExtended new tab pag..."

chrome/browser/ui/search/instant_controller.cc

 // Copyright 2012 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/ui/search/instant_controller.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1231 matching lines @@
   if (IsContentsFrom(overlay(), contents)) {
     overlay_->sender()->SetDisplayInstantResults(instant_enabled_);
     overlay_->sender()->FocusChanged(omnibox_focus_state_,
                                      omnibox_focus_change_reason_);
     overlay_->sender()->SetOmniboxBounds(omnibox_bounds_);
     overlay_->InitializeFonts();
   } else if (IsContentsFrom(ntp(), contents)) {
     ntp_->sender()->SetDisplayInstantResults(instant_enabled_);
     ntp_->sender()->SetOmniboxBounds(omnibox_bounds_);
     ntp_->InitializeFonts();
+    ntp_->InitializePromos();
   } else {
     NOTREACHED();
   }
   UpdateMostVisitedItems();
 }
 
 void InstantController::InstantSupportChanged(
     InstantSupportState instant_support) {
   // Handle INSTANT_SUPPORT_YES here because InstantPage is not hooked up to the
   // active tab. Search model changed listener in InstantPage will handle other
@@ skipping 419 matching lines @@
   if (instant_tab_) {
     instant_tab_->sender()->SetDisplayInstantResults(instant_enabled_);
     instant_tab_->sender()->SetOmniboxBounds(omnibox_bounds_);
 
     // Update theme details.
     InstantService* instant_service = GetInstantService();
     if (instant_service)
       instant_service->UpdateThemeInfo();
 
     instant_tab_->InitializeFonts();
+    instant_tab_->InitializePromos();
     UpdateMostVisitedItems();
     instant_tab_->sender()->FocusChanged(omnibox_focus_state_,
                                          omnibox_focus_change_reason_);
     instant_tab_->sender()->SetInputInProgress(IsInputInProgress());
   }
 }
 
 bool InstantController::IsInputInProgress() const {
   return !search_mode_.is_ntp() &&
       omnibox_focus_state_ == OMNIBOX_FOCUS_VISIBLE;
@@ skipping 219 matching lines @@
 
 bool InstantController::InStartup() const {
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   return !browser_->GetActiveWebContents();
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }