Rename Window->WindowWin

Pull basic Window interface out of WindowWin into new interface, Window.
Convert code to use it.

Review URL: http://codereview.chromium.org/46079

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11699 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 6b8e048..02495fc 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -354,7 +354,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()->UseNativeFrame())
+  if (GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame())
     canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1);
 }
 
@@ -498,8 +498,8 @@ gfx::Size BrowserToolbarView::GetPreferredSize() {
   }
 
   int vertical_spacing = PopupTopSpacing() +
-      (GetWidget()->AsWindow()->UseNativeFrame() ? kPopupBottomSpacingGlass
-                                                 : kPopupBottomSpacingNonGlass);
+      (GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame() ?
+          kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
   return gfx::Size(0, location_bar_->GetPreferredSize().height() +
       vertical_spacing);
 }
@@ -810,8 +810,8 @@ void BrowserToolbarView::ButtonPressed(views::BaseButton* sender) {
 
 // static
 int BrowserToolbarView::PopupTopSpacing() {
-  return GetWidget()->AsWindow()->UseNativeFrame() ? 0
-                                                   : kPopupTopSpacingNonGlass;
+  return GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame() ?
+      0 : kPopupTopSpacingNonGlass;
 }
 
 void BrowserToolbarView::Observe(NotificationType type,