Move more from Window onto Widget.

chrome/browser/ui/views/toolbar_view.cc

Index: chrome/browser/ui/views/toolbar_view.cc
===================================================================
--- chrome/browser/ui/views/toolbar_view.cc	(revision 88218)
+++ chrome/browser/ui/views/toolbar_view.cc	(working copy)
@@ -462,7 +462,7 @@
   }
 
   int vertical_spacing = PopupTopSpacing() +
-      (GetWindow()->ShouldUseNativeFrame() ?
+      (GetWidget()->ShouldUseNativeFrame() ?
           kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
   return gfx::Size(0, location_bar_->GetPreferredSize().height() +
       vertical_spacing);
@@ -562,7 +562,7 @@
   // 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 @@
 }
 
 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;
 }