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

chrome/renderer/searchbox/searchbox.cc

Index: chrome/renderer/searchbox/searchbox.cc
diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
index 5e76b7935bd0248d5dcff03c9a5f46e31372bae6..3631412b48337beae307be724140cdaa2384a916 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -28,7 +28,6 @@ SearchBox::SearchBox(content::RenderView* render_view)
       selection_end_(0),
       results_base_(0),
       start_margin_(0),
-      end_margin_(0),
       last_results_base_(0),
       is_key_capture_enabled_(false),
       display_instant_results_(false),
@@ -99,10 +98,6 @@ int SearchBox::GetStartMargin() const {
   return static_cast<int>(start_margin_ / GetZoom());
 }
 
-int SearchBox::GetEndMargin() const {
-  return static_cast<int>(end_margin_ / GetZoom());
-}
-
 gfx::Rect SearchBox::GetPopupBounds() const {
   double zoom = GetZoom();
   return gfx::Rect(static_cast<int>(popup_bounds_.x() / zoom),
@@ -216,9 +211,12 @@ void SearchBox::OnPopupResize(const gfx::Rect& bounds) {
   }
 }
 
-void SearchBox::OnMarginChange(int start, int end) {
-  start_margin_ = start;
-  end_margin_ = end;
+void SearchBox::OnMarginChange(int margin, int width) {
+  start_margin_ = margin;
+
+  // Override only the width parameter of the popup bounds.
+  popup_bounds_.set_width(width);
+
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMarginChange(
         render_view()->GetWebView()->mainFrame());
@@ -312,7 +310,6 @@ void SearchBox::Reset() {
   results_base_ = 0;
   popup_bounds_ = gfx::Rect();
   start_margin_ = 0;
-  end_margin_ = 0;
   autocomplete_results_.clear();
   is_key_capture_enabled_ = false;
   theme_info_ = ThemeBackgroundInfo();