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

chrome/browser/instant/instant_client.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/browser/instant/instant_client.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 25 matching lines @@
 }
 
 void InstantClient::Cancel(const string16& text) {
   Send(new ChromeViewMsg_SearchBoxCancel(routing_id(), text));
 }
 
 void InstantClient::SetPopupBounds(const gfx::Rect& bounds) {
   Send(new ChromeViewMsg_SearchBoxPopupResize(routing_id(), bounds));
 }
 
-void InstantClient::SetMarginSize(const int start, const int end) {
-  Send(new ChromeViewMsg_SearchBoxMarginChange(routing_id(), start, end));
+void InstantClient::SetStartMarginAndWidth(int margin, int width) {
+  Send(new ChromeViewMsg_SearchBoxMarginChange(routing_id(), margin, width));
 }
 
 void InstantClient::InitializeFonts() {
   const gfx::Font& omnibox_font =
       ui::ResourceBundle::GetSharedInstance().GetFont(
           ui::ResourceBundle::MediumFont);
   string16 omnibox_font_name = UTF8ToUTF16(omnibox_font.GetFontName());
   size_t omnibox_font_size = omnibox_font.GetFontSize();
   Send(new ChromeViewMsg_SearchBoxFontInformation(
       routing_id(), omnibox_font_name, omnibox_font_size));
@@ skipping 112 matching lines @@
   if (web_contents()->IsActiveEntry(page_id))
     delegate_->StopCapturingKeyStrokes();
 }
 
 void InstantClient::SearchBoxNavigate(int page_id,
                                       const GURL& url,
                                       content::PageTransition transition) {
   if (web_contents()->IsActiveEntry(page_id))
     delegate_->NavigateToURL(url, transition);
 }