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

chrome/browser/instant/instant_controller.h

Index: chrome/browser/instant/instant_controller.h
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index 05ec11bd32c179cd50ee0c50b1e75450116426e8..0b3157f0838c8ada68928608f43f7f7438b6d894 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -81,8 +81,8 @@ class InstantController {
   // Sets the bounds of the omnibox popup, in screen coordinates.
   void SetPopupBounds(const gfx::Rect& bounds);
 
-  // Sets the start and end margins of the omnibox text area.
-  void SetMarginSize(int start, int end);
+  // Sets the stored start-edge margin and width.
+  void SetStartMarginAndWidth(int margin, int width);
 
   // Send autocomplete results from |providers| to the preview page.
   void HandleAutocompleteResults(
@@ -322,11 +322,10 @@ class InstantController {
   // Last popup bounds passed to the page.
   gfx::Rect last_popup_bounds_;
 
-  // Size of the start-edge omnibox text area margin.
+  // The start-edge margin and width to use for aligning the preview contents
+  // with the omnibox.
   int start_margin_;
-
-  // Size of the end-edge omnibox text area margin.
-  int end_margin_;
+  int width_;
 
   // Timer used to update the bounds of the omnibox popup.
   base::OneShotTimer<InstantController> update_bounds_timer_;