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

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 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/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 1232 matching lines @@
   state->selection_start = entry_start;
   state->selection_end = entry_end;
 }
 
 bool LocationBarView::HasFocus() const {
   return location_entry_->model()->has_focus();
 }
 
 void LocationBarView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   if (browser_ && browser_->instant_controller() && parent()) {
-    // Pass the side margins of the location bar to the Instant Controller.
+    // Pass the start margin and width of the location bar to the Instant
+    // Controller.
     const gfx::Rect bounds = GetBoundsInScreen();
     const gfx::Rect parent_bounds = parent()->GetBoundsInScreen();
-    int start = bounds.x() - parent_bounds.x();
-    int end = parent_bounds.right() - bounds.right();
-    if (base::i18n::IsRTL())
-      std::swap(start, end);
-    browser_->instant_controller()->SetMarginSize(start, end);
+    const int margin = base::i18n::IsRTL() ?
+        parent_bounds.right() - bounds.right() : bounds.x() - parent_bounds.x();

[Peter Kasting, 2013/02/26 22:07:19]

Accessing the parent bounds at all, let alone using GetBoundsInScreen(), is
inefficient.

bounds() returns your bounds in parent coordinates.  If that doesn't do the
right thing for the RTL case, look at GetMirroredX() or GetMirroredBounds()
(probably the former is all you need).  Hopefully with those you can avoid
needing to explicitly calculate things.

[melevin, 2013/02/26 23:43:52]

Ah you're right, this code simplified down to just using the bounds.

+    const int width = bounds.width();
+    browser_->instant_controller()->SetStartMarginAndWidth(margin, width);
   }
 }
 
 void LocationBarView::WriteDragDataForView(views::View* sender,
                                            const gfx::Point& press_pt,
                                            OSExchangeData* data) {
   DCHECK_NE(GetDragOperationsForView(sender, press_pt),
             ui::DragDropTypes::DRAG_NONE);
 
   WebContents* web_contents = GetWebContents();
@@ skipping 182 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }