Fixes build breakage of non-Aura Windows.

Fixes build breakage of non-Aura Windows.

Fixes the build breakage of non-Aura Windows caused by http://crrev.com/54353002 .

BUG=315056
TEST=Done manually.
TBR=pkasting@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=233073

[Yuki, 2013-11-05 13:46:22]

Could you review this CL?  Thanks.

[commit-bot: I haz the power, 2013-11-05 13:46:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yukishiino@chromium.org/59193005/20001

[commit-bot: I haz the power, 2013-11-05 15:47:09]

Retried try job too often on linux_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2013-11-05 15:52:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yukishiino@chromium.org/59193005/20001

[commit-bot: I haz the power, 2013-11-05 16:12:10]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-11-05 16:30:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yukishiino@chromium.org/59193005/290001

[commit-bot: I haz the power, 2013-11-05 16:51:18]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-05 17:22:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yukishiino@chromium.org/59193005/290001

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

LGTM

https://codereview.chromium.org/59193005/diff/290001/chrome/browser/ui/views/...
File chrome/browser/ui/views/omnibox/omnibox_view_win.cc (right):

https://codereview.chromium.org/59193005/diff/290001/chrome/browser/ui/views/...
chrome/browser/ui/views/omnibox/omnibox_view_win.cc:526: font_y_adjustment_ =
std::max(0,
Nit: All lines of args to a function call should begin at the same
indentation... so move "0," to next line

https://codereview.chromium.org/59193005/diff/290001/chrome/browser/ui/views/...
chrome/browser/ui/views/omnibox/omnibox_view_win.cc:527: int((location_height -
cap_height) / 2 - tm.tmInternalLeading));
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<>.

[commit-bot: I haz the power, 2013-11-05 20:33:43]

Change committed as 233073

[Yuki, 2013-11-06 05:35:09]

Since this CL has already been committed by TBR, I'll send another CL to address
your comments.

https://codereview.chromium.org/59513006/

https://codereview.chromium.org/59193005/diff/290001/chrome/browser/ui/views/...
File chrome/browser/ui/views/omnibox/omnibox_view_win.cc (right):

https://codereview.chromium.org/59193005/diff/290001/chrome/browser/ui/views/...
chrome/browser/ui/views/omnibox/omnibox_view_win.cc:526: font_y_adjustment_ =
std::max(0,
On 2013/11/05 19:22:39, Peter Kasting wrote:
> Nit: All lines of args to a function call should begin at the same
> indentation... so move "0," to next line

Done.

https://codereview.chromium.org/59193005/diff/290001/chrome/browser/ui/views/...
chrome/browser/ui/views/omnibox/omnibox_view_win.cc:527: int((location_height -
cap_height) / 2 - tm.tmInternalLeading));
On 2013/11/05 19:22:39, Peter Kasting wrote:
> 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<>.

Done.

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