From c2ab7327dc1fa24ec753b098e1e902b1bab4d936 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Wed, 29 Apr 2009 19:40:09 +0000 Subject: Two changes: . Removes MoveToFront on Widget. . CHanges AsWindow to GetWindow. BUG=none TEST=none Review URL: http://codereview.chromium.org/99133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14868 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/toolbar_view.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/views/toolbar_view.cc') diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 4757920..f4270aa 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -399,7 +399,7 @@ void BrowserToolbarView::Paint(ChromeCanvas* canvas) { // For glass, we need to draw a black line below the location bar to separate // it from the content area. For non-glass, the NonClientView draws the // toolbar background below the location bar for us. - if (GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame()) + if (GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame()) canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1); } @@ -554,7 +554,7 @@ gfx::Size BrowserToolbarView::GetPreferredSize() { } int vertical_spacing = PopupTopSpacing() + - (GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame() ? + (GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame() ? kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass); return gfx::Size(0, location_bar_->GetPreferredSize().height() + vertical_spacing); @@ -883,7 +883,7 @@ gfx::Rect BrowserToolbarView::GetPopupBounds() const { // static int BrowserToolbarView::PopupTopSpacing() { - return GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame() ? + return GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame() ? 0 : kPopupTopSpacingNonGlass; } -- cgit v1.1