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

chrome/renderer/searchbox/searchbox_extension.cc

Index: chrome/renderer/searchbox/searchbox_extension.cc
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index db8bc11cde44c3aa89ea96c57f5e199360ef0953..9c459616bae340963c63f46d6b56e3fe73c160ae 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -231,12 +231,11 @@ class SearchBoxExtensionWrapper : public v8::Extension {
   static v8::Handle<v8::Value> GetHeight(const v8::Arguments& args);
 
   // Gets the width of the margin from the start-edge of the page to the start
-  // of the suggestions dropdown.
-  static v8::Handle<v8::Value> GetStartMargin(const v8::Arguments& args);
+  // of the location bar.
+  static v8::Handle<v8::Value> GetLocationBarMargin(const v8::Arguments& args);
 
-  // Gets the width of the margin from the end-edge of the page to the end of
-  // the suggestions dropdown.
-  static v8::Handle<v8::Value> GetEndMargin(const v8::Arguments& args);
+  // Gets the width of the location bar.
+  static v8::Handle<v8::Value> GetLocationBarWidth(const v8::Arguments& args);
 
   // Returns true if the Searchbox itself is oriented right-to-left.
   static v8::Handle<v8::Value> GetRightToLeft(const v8::Arguments& args);
@@ -332,10 +331,10 @@ v8::Handle<v8::FunctionTemplate> SearchBoxExtensionWrapper::GetNativeFunction(
     return v8::FunctionTemplate::New(GetWidth);
   if (name->Equals(v8::String::New("GetHeight")))
     return v8::FunctionTemplate::New(GetHeight);
-  if (name->Equals(v8::String::New("GetStartMargin")))
-    return v8::FunctionTemplate::New(GetStartMargin);
-  if (name->Equals(v8::String::New("GetEndMargin")))
-    return v8::FunctionTemplate::New(GetEndMargin);
+  if (name->Equals(v8::String::New("GetLocationBarMargin")))
+    return v8::FunctionTemplate::New(GetLocationBarMargin);
+  if (name->Equals(v8::String::New("GetLocationBarWidth")))
+    return v8::FunctionTemplate::New(GetLocationBarWidth);
   if (name->Equals(v8::String::New("GetRightToLeft")))
     return v8::FunctionTemplate::New(GetRightToLeft);
   if (name->Equals(v8::String::New("GetAutocompleteResults")))
@@ -463,19 +462,19 @@ v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetHeight(
 }
 
 // static
-v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetStartMargin(
+v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetLocationBarMargin(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
-  return v8::Int32::New(SearchBox::Get(render_view)->GetStartMargin());
+  return v8::Int32::New(SearchBox::Get(render_view)->GetLocationBarMargin());
 }
 
 // static
-v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetEndMargin(
+v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetLocationBarWidth(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
-  return v8::Int32::New(SearchBox::Get(render_view)->GetEndMargin());
+  return v8::Int32::New(SearchBox::Get(render_view)->GetLocationBarWidth());
 }
 
 // static