From 68c477df6917633a7a9c64f8624446ca0bd895d5 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Wed, 8 Jun 2011 17:47:43 +0000 Subject: Move more from Window onto Widget. BUG=72040 TEST=none Review URL: http://codereview.chromium.org/7054052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88356 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/views/toolbar_view.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome/browser/ui/views/toolbar_view.cc') diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 281993e..9721b0b 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -462,7 +462,7 @@ gfx::Size ToolbarView::GetPreferredSize() { } int vertical_spacing = PopupTopSpacing() + - (GetWindow()->ShouldUseNativeFrame() ? + (GetWidget()->ShouldUseNativeFrame() ? kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass); return gfx::Size(0, location_bar_->GetPreferredSize().height() + vertical_spacing); @@ -562,7 +562,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 (GetWindow()->ShouldUseNativeFrame()) + if (GetWidget()->ShouldUseNativeFrame()) canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1); } @@ -633,16 +633,16 @@ bool ToolbarView::ShouldShowIncompatibilityWarning() { } int ToolbarView::PopupTopSpacing() const { - // TODO(beng): For some reason GetWindow() returns NULL here in some + // TODO(beng): For some reason GetWidget() returns NULL here in some // unidentified circumstances on ChromeOS. This means GetWidget() // succeeded but we were (probably) unable to locate a // NativeWidgetGtk* on it using // NativeWidget::GetNativeWidgetForNativeView. // I am throwing in a NULL check for now to stop the hurt, but // it's possible the crash may just show up somewhere else. - const views::Window* window = GetWindow(); - DCHECK(window) << "If you hit this please talk to beng"; - return window && window->ShouldUseNativeFrame() ? + const views::Widget* widget = GetWidget(); + DCHECK(widget) << "If you hit this please talk to beng"; + return widget && widget->ShouldUseNativeFrame() ? 0 : kPopupTopSpacingNonGlass; } -- cgit v1.1