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 223c320df5a7b08552eb2b2c6ca7a22ba55eb3cb..028c94aa52f88e2a600b0e85311a6e94dd92fcde 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -16,8 +16,8 @@ SearchBox::SearchBox(content::RenderView* render_view)
       selection_start_(0),
       selection_end_(0),
       results_base_(0),
-      start_margin_(0),
-      end_margin_(0),
+      location_bar_margin_(0),
+      location_bar_width_(0),
       last_results_base_(0),
       is_key_capture_enabled_(false),
       theme_area_height_(0),
@@ -66,12 +66,12 @@ void SearchBox::NavigateToURL(const GURL& url,
       url, transition));
 }
 
-int SearchBox::GetStartMargin() const {
-  return static_cast<int>(start_margin_ / GetZoom());
+int SearchBox::GetLocationBarMargin() const {
+  return static_cast<int>(location_bar_margin_ / GetZoom());
 }
 
-int SearchBox::GetEndMargin() const {
-  return static_cast<int>(end_margin_ / GetZoom());
+int SearchBox::GetLocationBarWidth() const {
+  return static_cast<int>(location_bar_width_ / GetZoom());
 }
 
 gfx::Rect SearchBox::GetPopupBounds() const {
@@ -191,9 +191,9 @@ 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) {
+  location_bar_margin_ = margin;
+  location_bar_width_ = width;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMarginChange(
         render_view()->GetWebView()->mainFrame());
@@ -291,8 +291,8 @@ void SearchBox::Reset() {
   selection_end_ = 0;
   results_base_ = 0;
   popup_bounds_ = gfx::Rect();
-  start_margin_ = 0;
-  end_margin_ = 0;
+  location_bar_margin_ = 0;
+  location_bar_width_ = 0;
   autocomplete_results_.clear();
   is_key_capture_enabled_ = false;
   mode_ = chrome::search::Mode();