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

chrome/browser/ui/search/instant_page.cc

 // Copyright 2013 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_page.h"
 
+#include "apps/app_launcher.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/search/instant_ipc_sender.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 33 matching lines @@
           ui::ResourceBundle::MediumFont).DeriveFont(1);
 #else
   const gfx::Font& omnibox_font =
       ui::ResourceBundle::GetSharedInstance().GetFont(
           ui::ResourceBundle::MediumFont);
 #endif
   sender()->SetFontInformation(UTF8ToUTF16(omnibox_font.GetFontName()),
                                omnibox_font.GetFontSize());
 }
 
+void InstantPage::InitializePromos() {
+  sender()->SetPromoInformation(apps::IsAppLauncherEnabled());
+}
+
 InstantPage::InstantPage(Delegate* delegate, const std::string& instant_url,
                          bool is_incognito)
     : delegate_(delegate),
       ipc_sender_(InstantIPCSender::Create(is_incognito)),
       instant_url_(instant_url),
       is_incognito_(is_incognito) {
 }
 
 void InstantPage::SetContents(content::WebContents* web_contents) {
   ClearContents();
@@ skipping 216 matching lines @@
   delegate_->UndoAllMostVisitedDeletions();
 }
 
 void InstantPage::ClearContents() {
   if (contents())
     SearchTabHelper::FromWebContents(contents())->model()->RemoveObserver(this);
 
   sender()->SetContents(NULL);
   Observe(NULL);
 }