| Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| index 7187c144643653d82d91d897ba93f11758e0861b..3d95391632a3f9310110e4506ecc6e470e76db39 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| @@ -520,7 +520,7 @@ gfx::Size ToolbarView::GetPreferredSize() {
|
| const int kPopupBottomSpacingNonGlass = 2;
|
| size.Enlarge(
|
| 0,
|
| - PopupTopSpacing() + (GetWidget()->ShouldUseNativeFrame() ?
|
| + PopupTopSpacing() + (GetWidget()->ShouldWindowContentsBeTransparent() ?
|
| kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass));
|
| }
|
| return size;
|
| @@ -663,7 +663,7 @@ void ToolbarView::OnPaint(gfx::Canvas* canvas) {
|
| // it from the content area. For non-glass, the NonClientView draws the
|
| // toolbar background below the location bar for us.
|
| // NOTE: Keep this in sync with BrowserView::GetInfoBarSeparatorColor()!
|
| - if (GetWidget()->ShouldUseNativeFrame())
|
| + if (GetWidget()->ShouldWindowContentsBeTransparent())
|
| canvas->FillRect(gfx::Rect(0, height() - 1, width(), 1), SK_ColorBLACK);
|
| }
|
|
|
| @@ -739,7 +739,9 @@ bool ToolbarView::ShouldShowIncompatibilityWarning() {
|
|
|
| int ToolbarView::PopupTopSpacing() const {
|
| const int kPopupTopSpacingNonGlass = 3;
|
| - return GetWidget()->ShouldUseNativeFrame() ? 0 : kPopupTopSpacingNonGlass;
|
| + return GetWidget()->ShouldWindowContentsBeTransparent()
|
| + ? 0
|
| + : kPopupTopSpacingNonGlass;
|
| }
|
|
|
| void ToolbarView::LoadImages() {
|
|
|