| Index: chrome/renderer/searchbox/searchbox.h | 
| diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h | 
| index 2327b27d3e6745103154f664b8e545f38e237e72..308cf9bb10e93bfc323bbbf8ade9c64356a1fc4d 100644 | 
| --- a/chrome/renderer/searchbox/searchbox.h | 
| +++ b/chrome/renderer/searchbox/searchbox.h | 
| @@ -40,7 +40,14 @@ class SearchBox : public content::RenderViewObserver, | 
| int results_base() const { return results_base_; } | 
| const chrome::search::Mode& mode() const { return mode_; } | 
|  | 
| -  gfx::Rect GetRect(); | 
| +  // These functions return the start/end margins of the page text area, | 
| +  // adjusted for the page zoom. | 
| +  int GetStartMargin() const; | 
| +  int GetEndMargin() const; | 
| + | 
| +  // Returns the bounds of the Searchbox popup in screen coordinates. | 
| +  gfx::Rect GetPopupBounds() const; | 
| + | 
| const std::vector<InstantAutocompleteResult>& GetAutocompleteResults(); | 
| // Searchbox retains ownership of this object. | 
| const InstantAutocompleteResult* | 
| @@ -58,7 +65,8 @@ class SearchBox : public content::RenderViewObserver, | 
| size_t selection_end); | 
| void OnSubmit(const string16& query); | 
| void OnCancel(const string16& query); | 
| -  void OnResize(const gfx::Rect& bounds); | 
| +  void OnPopupResize(const gfx::Rect& bounds); | 
| +  void OnMarginChange(int start, int end); | 
| void OnDetermineIfPageSupportsInstant(); | 
| void OnAutocompleteResults( | 
| const std::vector<InstantAutocompleteResult>& results); | 
| @@ -67,6 +75,9 @@ class SearchBox : public content::RenderViewObserver, | 
| void OnThemeChanged(const ThemeBackgroundInfo& theme_info); | 
| void OnThemeAreaHeightChanged(int height); | 
|  | 
| +  // 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(); | 
|  | 
| @@ -75,7 +86,9 @@ class SearchBox : public content::RenderViewObserver, | 
| size_t selection_start_; | 
| size_t selection_end_; | 
| size_t results_base_; | 
| -  gfx::Rect rect_; | 
| +  int start_margin_; | 
| +  int end_margin_; | 
| +  gfx::Rect popup_bounds_; | 
| std::vector<InstantAutocompleteResult> autocomplete_results_; | 
| size_t last_results_base_; | 
| std::vector<InstantAutocompleteResult> last_autocomplete_results_; | 
|  |