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

chrome/renderer/searchbox/searchbox.cc

Index: chrome/renderer/searchbox/searchbox.cc
===================================================================
--- chrome/renderer/searchbox/searchbox.cc	(revision 208940)
+++ chrome/renderer/searchbox/searchbox.cc	(working copy)
@@ -90,6 +90,7 @@
       is_input_in_progress_(false),
       display_instant_results_(false),
       omnibox_font_size_(0),
+      app_launcher_enabled_(false),
       autocomplete_results_cache_(kMaxInstantAutocompleteResultItemCacheSize),
       most_visited_items_cache_(kMaxInstantMostVisitedItemCacheSize) {
 }
@@ -271,6 +272,8 @@
                         OnThemeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFontInformation,
                         OnFontInformationReceived)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPromoInformation,
+                        OnPromoInformationReceived)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
                         OnMostVisitedChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxToggleVoiceSearch,
@@ -487,6 +490,10 @@
   omnibox_font_size_ = omnibox_font_size;
 }
 
+void SearchBox::OnPromoInformationReceived(bool is_app_launcher_enabled) {
+  app_launcher_enabled_ = is_app_launcher_enabled;
+}
+
 double SearchBox::GetZoom() const {
   WebKit::WebView* web_view = render_view()->GetWebView();
   if (web_view) {