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..57e0f90da08becf47663248ad95021c04b09025a 100644
--- a/chrome/renderer/searchbox/searchbox.h
+++ b/chrome/renderer/searchbox/searchbox.h
@@ -54,10 +54,10 @@ 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,
+  // These functions return the start-edge margin and width of the location bar,
   // adjusted for the page zoom.
-  int GetStartMargin() const;
-  int GetEndMargin() const;
+  int GetLocationBarMargin() const;
+  int GetLocationBarWidth() const;
 
   // Returns the bounds of the omnibox popup in screen coordinates.
   gfx::Rect GetPopupBounds() const;
@@ -81,7 +81,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);
@@ -105,8 +105,8 @@ class SearchBox : public content::RenderViewObserver,
   size_t selection_start_;
   size_t selection_end_;
   size_t results_base_;
-  int start_margin_;
-  int end_margin_;
+  int location_bar_margin_;
+  int location_bar_width_;
   gfx::Rect popup_bounds_;
   std::vector<InstantAutocompleteResult> autocomplete_results_;
   size_t last_results_base_;