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 90c3024c38acf71a3bfb4f6902e1521c1ec339a7..7f8f1d44d1e74eb931fcc017081127f3e144aea7 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -101,8 +101,8 @@ class InstantController : public InstantPage::Delegate,
   // 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 of the omnibox.
+  void SetStartMarginAndWidth(int margin, int width);
 
   // Send autocomplete results from |providers| to the preview page.
   void HandleAutocompleteResults(
@@ -399,11 +399,10 @@ class InstantController : public InstantPage::Delegate,
   // Last popup bounds passed to the page.
   gfx::Rect last_popup_bounds_;
 
-  // Size of the start-edge omnibox text area margin.
-  int start_margin_;
-
-  // Size of the end-edge omnibox text area margin.
-  int end_margin_;
+  // The start-edge margin and width of the omnibox, used by the page to align
+  // its suggestions with the omnibox.
+  int omnibox_start_margin_;
+  int omnibox_width_;
 
   // Timer used to update the bounds of the omnibox popup.
   base::OneShotTimer<InstantController> update_bounds_timer_;