Change the SearchBox API from using the start/end margins of the location bar to using the start ma…

chrome/renderer/searchbox/searchbox.h

Index: chrome/renderer/searchbox/searchbox.h
diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h
index 74c16c6f1f6cccc8ac023a37e6a66747ca4d2df7..8457ac1f787aa56656968c85635a524911223037 100644
--- a/chrome/renderer/searchbox/searchbox.h
+++ b/chrome/renderer/searchbox/searchbox.h
@@ -54,10 +54,13 @@ class SearchBox : public content::RenderViewObserver,
   const string16& omnibox_font() const { return omnibox_font_; }
   size_t omnibox_font_size() const { return omnibox_font_size_; }
 
-  // These functions return the start/end margins of the page text area,
-  // adjusted for the page zoom.
+  // In extended Instant, returns the start-edge margin of the location bar in
+  // screen pixels.
   int GetStartMargin() const;
-  int GetEndMargin() const;
+
+  // In extended Instant, returns the width of the location bar. Otherwise,
+  // returns the popup width.
+  int GetWidth() const;
 
   // Returns the bounds of the omnibox popup in screen coordinates.
   gfx::Rect GetPopupBounds() const;
@@ -81,7 +84,7 @@ class SearchBox : public content::RenderViewObserver,
   void OnSubmit(const string16& query);
   void OnCancel(const string16& query);
   void OnPopupResize(const gfx::Rect& bounds);
-  void OnMarginChange(int start, int end);
+  void OnMarginChange(int margin, int width);
   void OnDetermineIfPageSupportsInstant();
   void OnAutocompleteResults(
       const std::vector<InstantAutocompleteResult>& results);
@@ -106,7 +109,7 @@ class SearchBox : public content::RenderViewObserver,
   size_t selection_end_;
   size_t results_base_;
   int start_margin_;
-  int end_margin_;
+  int width_;

[sreeram, 2013/02/14 18:26:57]

Why do we need this? It's the same as the popup_bounds_.width.

[melevin, 2013/02/19 22:00:49]

Yeah I suppose we can reuse that.

   gfx::Rect popup_bounds_;
   std::vector<InstantAutocompleteResult> autocomplete_results_;
   size_t last_results_base_;