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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 213 matching lines @@
   // region of the search box that overlaps the window.
   static v8::Handle<v8::Value> GetY(const v8::Arguments& args);
 
   // Gets the width of the region of the search box that overlaps the window.
   static v8::Handle<v8::Value> GetWidth(const v8::Arguments& args);
 
   // Gets the height of the region of the search box that overlaps the window.
   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);
 
   // Gets the autocomplete results from search box.
   static v8::Handle<v8::Value> GetAutocompleteResults(
       const v8::Arguments& args);
 
   // Gets the current session context.
   static v8::Handle<v8::Value> GetContext(const v8::Arguments& args);
@@ skipping 75 matching lines @@
   if (name->Equals(v8::String::New("GetSelectionEnd")))
     return v8::FunctionTemplate::New(GetSelectionEnd);
   if (name->Equals(v8::String::New("GetX")))
     return v8::FunctionTemplate::New(GetX);
   if (name->Equals(v8::String::New("GetY")))
     return v8::FunctionTemplate::New(GetY);
   if (name->Equals(v8::String::New("GetWidth")))
     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")))
     return v8::FunctionTemplate::New(GetAutocompleteResults);
   if (name->Equals(v8::String::New("GetContext")))
     return v8::FunctionTemplate::New(GetContext);
   if (name->Equals(v8::String::New("GetDisplayInstantResults")))
     return v8::FunctionTemplate::New(GetDisplayInstantResults);
   if (name->Equals(v8::String::New("GetThemeBackgroundInfo")))
     return v8::FunctionTemplate::New(GetThemeBackgroundInfo);
@@ skipping 107 matching lines @@
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetHeight(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
 
   return v8::Int32::New(SearchBox::Get(render_view)->GetPopupBounds().height());
 }
 
 // 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
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetRightToLeft(
     const v8::Arguments& args) {
   return v8::Boolean::New(base::i18n::IsRTL());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetAutocompleteResults(
@@ skipping 469 matching lines @@
   Dispatch(frame, kDispatchThemeAreaHeightChangeEventScript);
 }
 
 // static
 v8::Extension* SearchBoxExtension::Get() {
   return new SearchBoxExtensionWrapper(ResourceBundle::GetSharedInstance().
       GetRawDataResource(IDR_SEARCHBOX_API));
 }
 
 }  // namespace extensions_v8