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

chrome/browser/instant/instant_page.cc

 // Copyright 2013 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_page.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 18 matching lines @@
 }
 
 void InstantPage::Cancel(const string16& text) {
   Send(new ChromeViewMsg_SearchBoxCancel(routing_id(), text));
 }
 
 void InstantPage::SetPopupBounds(const gfx::Rect& bounds) {
   Send(new ChromeViewMsg_SearchBoxPopupResize(routing_id(), bounds));
 }
 
-void InstantPage::SetMarginSize(const int start, const int end) {
-  Send(new ChromeViewMsg_SearchBoxMarginChange(routing_id(), start, end));
+void InstantPage::SetStartMarginAndWidth(int margin, int width) {
+  Send(new ChromeViewMsg_SearchBoxMarginChange(routing_id(), margin, width));
 }
 
 void InstantPage::InitializeFonts() {
   // TODO(sail) Remove this once the Mac omnibox font size is updated.
 #if defined(OS_MACOSX)
   ui::ResourceBundle::FontStyle font_style = ui::ResourceBundle::BaseFont;
 #else
   ui::ResourceBundle::FontStyle font_style = ui::ResourceBundle::MediumFont;
 #endif
   const gfx::Font& omnibox_font =
@@ skipping 179 matching lines @@
 
 void InstantPage::OnSearchBoxNavigate(int page_id,
                                       const GURL& url,
                                       content::PageTransition transition) {
   if (contents()->IsActiveEntry(page_id)) {
     OnInstantSupportDetermined(page_id, true);
     if (ShouldProcessNavigateToURL())
       delegate_->NavigateToURL(contents(), url, transition);
   }
 }