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

chrome/renderer/searchbox/searchbox.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.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       selection_start_(0),
       selection_end_(0),
       results_base_(0),
       start_margin_(0),
-      end_margin_(0),
+      width_(0),
       last_results_base_(0),
       is_key_capture_enabled_(false),
       theme_area_height_(0),
       display_instant_results_(false),
       omnibox_font_size_(0) {
 }
 
 SearchBox::~SearchBox() {
 }
 
@@ skipping 32 matching lines @@
                               content::PageTransition transition) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxNavigate(
       render_view()->GetRoutingID(), render_view()->GetPageId(),
       url, transition));
 }
 
 int SearchBox::GetStartMargin() const {
   return static_cast<int>(start_margin_ / GetZoom());
 }
 
-int SearchBox::GetEndMargin() const {
-  return static_cast<int>(end_margin_ / GetZoom());
+int SearchBox::GetWidth() const {
+  // Width set by a margin-change event takes precedence over the popup width.
+  return static_cast<int>(
+      (width_ ? width_ : popup_bounds_.width()) / GetZoom());
 }
 
 gfx::Rect SearchBox::GetPopupBounds() const {
   double zoom = GetZoom();
   return gfx::Rect(static_cast<int>(popup_bounds_.x() / zoom),
                    static_cast<int>(popup_bounds_.y() / zoom),
                    static_cast<int>(popup_bounds_.width() / zoom),
                    static_cast<int>(popup_bounds_.height() / zoom));
 }
 
@@ skipping 99 matching lines @@
 
 void SearchBox::OnPopupResize(const gfx::Rect& bounds) {
   popup_bounds_ = bounds;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     DVLOG(1) << render_view() << " OnPopupResize";
     extensions_v8::SearchBoxExtension::DispatchResize(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
-void SearchBox::OnMarginChange(int start, int end) {
-  start_margin_ = start;
-  end_margin_ = end;
+void SearchBox::OnMarginChange(int margin, int width) {
+  start_margin_ = margin;
+  width_ = width;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMarginChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnDetermineIfPageSupportsInstant() {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
         render_view()->GetWebView()->mainFrame());
@@ skipping 78 matching lines @@
 }
 
 void SearchBox::Reset() {
   query_.clear();
   verbatim_ = false;
   selection_start_ = 0;
   selection_end_ = 0;
   results_base_ = 0;
   popup_bounds_ = gfx::Rect();
   start_margin_ = 0;
-  end_margin_ = 0;
+  width_ = 0;
   autocomplete_results_.clear();
   is_key_capture_enabled_ = false;
   mode_ = chrome::search::Mode();
   theme_info_ = ThemeBackgroundInfo();
   theme_area_height_ = 0;
   // Don't reset display_instant_results_ to prevent clearing it on committed
   // results pages in extended mode. Otherwise resetting it is a no-op because
   // a new loader is created when it changes; see crbug.com/164662.
   // Also don't reset omnibox_font_ or omnibox_font_size_ since it never
   // changes.
 }