Fixes build breakage of non-Aura Windows.

chrome/browser/ui/views/omnibox/omnibox_view_win.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/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 431 matching lines @@
 const int kTwipsPerInch = 1440;
 
 }  // namespace
 
 HMODULE OmniboxViewWin::loaded_library_module_ = NULL;
 
 OmniboxViewWin::OmniboxViewWin(OmniboxEditController* controller,
                                LocationBarView* location_bar,
                                CommandUpdater* command_updater,
                                bool popup_window_mode,
-                               const gfx::FontList& font_list,
-                               int font_y_offset)
+                               const gfx::FontList& font_list)
     : OmniboxView(location_bar->profile(), controller, command_updater),
       popup_view_(OmniboxPopupContentsView::Create(
           font_list, this, model(), location_bar)),
       location_bar_(location_bar),
       popup_window_mode_(popup_window_mode),
       force_hidden_(false),
       tracking_click_(),
       tracking_double_click_(false),
       double_click_time_(0),
       can_discard_mousemove_(false),
       ignore_ime_messages_(false),
       delete_at_end_pressed_(false),
       font_list_(font_list),
-      font_y_adjustment_(font_y_offset),
+      font_y_adjustment_(0),
       possible_drag_(false),
       in_drag_(false),
       initiated_drag_(false),
       drop_highlight_position_(-1),
       ime_candidate_window_open_(false),
       background_color_(skia::SkColorToCOLORREF(location_bar->GetColor(
           ToolbarModel::NONE, LocationBarView::BACKGROUND))),
       security_level_(ToolbarModel::NONE),
       text_object_model_(NULL),
       tsf_event_router_(base::win::IsTSFAwareRequired() ?
@@ skipping 37 matching lines @@
   base::win::ScopedSelectObject font_in_dc(screen_dc, native_font);
   TEXTMETRIC tm = {0};
   GetTextMetrics(screen_dc, &tm);
   int cap_height = font_list_.GetBaseline() - tm.tmInternalLeading;
   // The ratio of a font's x-height to its cap height.  Sadly, Windows
   // doesn't provide a true value for a font's x-height in its text
   // metrics, so we approximate.
   const float kXHeightRatio = 0.7f;
   font_x_height_ = static_cast<int>(
       (static_cast<float>(cap_height) * kXHeightRatio) + 0.5);
+  // Determine the y offset centering cap height.
+  const int location_height = location_bar_->GetInternalHeight(true);
+  font_y_adjustment_ = std::max(0,

[Peter Kasting, 2013/11/05 19:22:39]

Nit: All lines of args to a function call should begin at the same
indentation... so move "0," to next line

[Yuki, 2013/11/06 05:35:10]

Done.

+      int((location_height - cap_height) / 2 - tm.tmInternalLeading));

[Peter Kasting, 2013/11/05 19:22:39]

Why is the int cast needed here?  I don't think the compiler should complain
about (int - long).  If it does, use a static_cast<>.

[Yuki, 2013/11/06 05:35:10]

Done.

A template function std::max(T, T) requires the same type.  So we need to cast
one of them.

 
   // Get the number of twips per pixel, which we need below to offset our text
   // by the desired number of pixels.
   const long kTwipsPerPixel =
       kTwipsPerInch / GetDeviceCaps(screen_dc, LOGPIXELSY);
 
   // Set the default character style -- adjust to our desired baseline.
   CHARFORMAT cf = {0};
   cf.dwMask = CFM_OFFSET;
   cf.yOffset = -font_y_adjustment_ * kTwipsPerPixel;
@@ skipping 2264 matching lines @@
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_list_.GetPrimaryFont().GetStringWidth() instead of
   // PosFromChar(GetTextLength()) because PosFromChar() is apparently buggy.
   // In both LTR UI and RTL UI with left-to-right layout, PosFromChar(i) might
   // return 0 when i is greater than 1.
   return font_list_.GetPrimaryFont().GetStringWidth(text) +
       GetHorizontalMargin();
 }