Fixes vertical misalignment of IME autocompletion.

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 862 matching lines @@
             ime_inline_autocomplete_view_->text()) +
         ime_inline_autocomplete_view_->GetInsets().width();
     // All the target languages (IMEs) are LTR, and we do not need to support
     // RTL so far.  In other words, no testable RTL environment so far.
     int x = location_needed_width;
     if (width > entry_width)
       x = 0;
     else if (location_needed_width + width > entry_width)
       x = entry_width - width;
     location_bounds.set_width(x);
+    const int baseline_diff = location_entry_view_->GetBaseline() -

[Peter Kasting, 2013/08/09 19:00:48]

Instead of doing this here, shouldn't we be doing it where the view is created
and we already give it a y offset?

Is the y offset we set there wrong due to font list differences?

[Yuki, 2013/08/12 06:30:14]

That's right.  I've moved the code to the initialization part.

And yes, because views::Label currently takes only the first font in the font
list while views::Textfield takes the whole font list, the baselines mismatch.

I'm now fixing views::Label and related code, but it will take time.  After I'll
fix it, we'll be able to pass the same FontList to
ime_inline_autocomplete_view_.

+                              ime_inline_autocomplete_view_->GetBaseline();
     ime_inline_autocomplete_view_->SetBounds(
-        location_bounds.right(), location_bounds.y(),
+        location_bounds.right(),
+        location_bounds.y() + baseline_diff,
         std::min(width, entry_width),
         ime_inline_autocomplete_view_->GetPreferredSize().height());
   }
 
   location_entry_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
@@ skipping 611 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (vertical_edge_thickness() * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_->visible() &&
       !suggested_text_view_->size().IsEmpty();
 }