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

chrome/renderer/searchbox/searchbox.h

 // 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.
 
 #ifndef CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 58 matching lines @@
   bool verbatim() const { return verbatim_; }
   bool query_is_restricted() const { return query_is_restricted_; }
   size_t selection_start() const { return selection_start_; }
   size_t selection_end() const { return selection_end_; }
   bool is_focused() const { return is_focused_; }
   bool is_key_capture_enabled() const { return is_key_capture_enabled_; }
   bool is_input_in_progress() const { return is_input_in_progress_; }
   bool display_instant_results() const { return display_instant_results_; }
   const string16& omnibox_font() const { return omnibox_font_; }
   size_t omnibox_font_size() const { return omnibox_font_size_; }
+  bool app_launcher_enabled() const { return app_launcher_enabled_; }
 
   // In extended Instant, returns the start-edge margin of the location bar in
   // screen pixels.
   int GetStartMargin() const;
 
   // Returns the bounds of the omnibox popup in screen coordinates.
   gfx::Rect GetPopupBounds() const;
 
   const ThemeBackgroundInfo& GetThemeBackgroundInfo();
 
@@ skipping 72 matching lines @@
                          size_t selection_start,
                          size_t selection_end);
   void OnFocusChanged(OmniboxFocusState new_focus_state,
                       OmniboxFocusChangeReason reason);
   void OnSetInputInProgress(bool input_in_progress);
   void OnSetDisplayInstantResults(bool display_instant_results);
   void OnThemeChanged(const ThemeBackgroundInfo& theme_info);
   void OnThemeAreaHeightChanged(int height);
   void OnFontInformationReceived(const string16& omnibox_font,
                                  size_t omnibox_font_size);
+  void OnPromoInformationReceived(bool is_app_launcher_enabled);
   void OnMostVisitedChanged(
       const std::vector<InstantMostVisitedItem>& items);
   void OnToggleVoiceSearch();
 
   // Returns the current zoom factor of the render view or 1 on failure.
   double GetZoom() const;
 
   // Sets the searchbox values to their initial value.
   void Reset();
 
@@ skipping 10 matching lines @@
   size_t selection_end_;
   int start_margin_;
   gfx::Rect popup_bounds_;
   bool is_focused_;
   bool is_key_capture_enabled_;
   bool is_input_in_progress_;
   ThemeBackgroundInfo theme_info_;
   bool display_instant_results_;
   string16 omnibox_font_;
   size_t omnibox_font_size_;
+  bool app_launcher_enabled_;
   InstantRestrictedIDCache<InstantAutocompleteResult>
       autocomplete_results_cache_;
   InstantRestrictedIDCache<InstantMostVisitedItem> most_visited_items_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };
 
 #endif  // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_