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 1a08425b39423b7f64eba611099f18fa94b632fc..0a870898ce1c951579863f92f00921b82e7eb383 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -99,8 +99,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.

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

// Sets the start-edge margin and width of the omnibox.

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

I added "stored" because wanted to make it clear that this function won't
actually resize the omnibox.

+  void SetStartMarginAndWidth(int margin, int width);
 
   // Send autocomplete results from |providers| to the preview page.
   void HandleAutocompleteResults(
@@ -355,11 +355,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.
+  // The start-edge margin and width to use for aligning the preview contents

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

// The start-edge margin and width of the omnibox, used by the page to align its
suggestions with the omnibox.

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

Done.

+  // with the omnibox.
   int start_margin_;
-
-  // Size of the end-edge omnibox text area margin.
-  int end_margin_;
+  int width_;

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

These variables are too generic. Name them "omnibox_start_margin_" and
"omnibox_width_".

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

Done.

 
   // Timer used to update the bounds of the omnibox popup.
   base::OneShotTimer<InstantController> update_bounds_timer_;