Move more from Window onto Widget.

chrome/browser/chromeos/frame/browser_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/frame/browser_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 340 matching lines @@
   Layout();
 }
 
 bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame)) {
     // Typically we don't request a full screen size. This means we'll request a
     // non-full screen size, layout/paint at that size, then the window manager
     // will snap us to full screen size. This results in an ugly
     // resize/paint. To avoid this we always request a full screen size.
     *bounds = views::Screen::GetMonitorWorkAreaNearestWindow(
-        GTK_WIDGET(GetWindow()->GetNativeWindow()));
+        GTK_WIDGET(GetWidget()->GetNativeWindow()));
     return true;
   }
   return ::BrowserView::GetSavedWindowBounds(bounds);
 }
 
 void BrowserView::Cut() {
   gtk_util::DoCut(this);
 }
 
 void BrowserView::Copy() {
@@ skipping 28 matching lines @@
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
   // - HTNOWHERE: as the name implies.
   gfx::Point point_in_parent_coords(p);
   views::View::ConvertPointToView(NULL, parent(), &point_in_parent_coords);
   int hit_test = NonClientHitTest(point_in_parent_coords);
   if (hit_test == HTCAPTION || hit_test == HTNOWHERE) {
     // rebuild menu so it reflects current application state
     InitSystemMenu();
-    system_menu_->RunMenuAt(source->GetWindow()->GetNativeWindow(), NULL,
+    system_menu_->RunMenuAt(source->GetWidget()->GetNativeWindow(), NULL,
                             gfx::Rect(p, gfx::Size(0,0)),
                             views::MenuItemView::TOPLEFT,
                             true);
   }
 }
 
 // BrowserView, views::MenuListener implementation.
 void BrowserView::OnMenuOpened() {
   // Save the focused widget before wrench menu opens.
   saved_focused_widget_ = gtk_window_get_focus(GetNativeHandle());
 }
 
 // BrowserView, StatusAreaHost implementation.
 
 Profile* BrowserView::GetProfile() const {
   return browser()->profile();
 }
 
 gfx::NativeWindow BrowserView::GetNativeWindow() const {
-  return GetWindow()->GetNativeWindow();
+  return GetWidget()->GetNativeWindow();
 }
 
 bool BrowserView::ShouldOpenButtonOptions(
     const views::View* button_view) const {
   return true;
 }
 
 void BrowserView::ExecuteBrowserCommand(int id) const {
   browser()->ExecuteCommand(id);
 }
@@ skipping 48 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->is_type_popup() || browser->is_type_panel())
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }