Move more from Window onto Widget.

chrome/browser/ui/views/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/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 236 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // ResizeCorner, private:
 
 class ResizeCorner : public views::View {
  public:
   ResizeCorner() {
     EnableCanvasFlippingForRTLUI(true);
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) {
-    views::Window* window = GetWindow();
-    if (!window || (window->IsMaximized() || window->IsFullscreen()))
+    views::Widget* widget = GetWidget();
+    if (!widget || (widget->IsMaximized() || widget->IsFullscreen()))
       return;
 
     SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_TEXTAREA_RESIZER);
     bitmap->buildMipMap(false);
     canvas->DrawBitmapInt(*bitmap, width() - bitmap->width(),
                           height() - bitmap->height());
   }
 
   static gfx::Size GetSize() {
     // This is disabled until we find what makes us slower when we let
     // WebKit know that we have a resizer rect...
     // int scrollbar_thickness = gfx::scrollbar_size();
     // return gfx::Size(scrollbar_thickness, scrollbar_thickness);
     return gfx::Size();
   }
 
   virtual gfx::Size GetPreferredSize() {
-    views::Window* window = GetWindow();
-    return (!window || window->IsMaximized() || window->IsFullscreen()) ?
+    views::Widget* widget = GetWidget();
+    return (!widget || widget->IsMaximized() || widget->IsFullscreen()) ?
         gfx::Size() : GetSize();
   }
 
   virtual void Layout() {
     if (parent()) {
       gfx::Size ps = GetPreferredSize();
       // No need to handle Right to left text direction here,
       // our parent must take care of it for us...
       // TODO(alekseys): fix it.
       SetBounds(parent()->width() - ps.width(),
                 parent()->height() - ps.height(), ps.width(), ps.height());
     }
   }
 
  private:
-  // Returns the NativeWindowWin we're displayed in. Returns NULL if we're not
-  // currently in a window.
-  views::Window* GetWindow() {
-    views::Widget* widget = GetWidget();
-    return widget ? widget->GetContainingWindow() : NULL;
-  }
-
   DISALLOW_COPY_AND_ASSIGN(ResizeCorner);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
 BrowserView::BrowserView(Browser* browser)
     : views::ClientView(NULL, NULL),
       last_focused_view_storage_id_(
           views::ViewStorage::GetInstance()->CreateStorageID()),
@@ skipping 430 matching lines @@
       LoadingAnimationCallback();
     }
   }
 }
 
 void BrowserView::SetStarredState(bool is_starred) {
   GetLocationBarView()->SetStarToggled(is_starred);
 }
 
 gfx::Rect BrowserView::GetRestoredBounds() const {
-  return frame_->GetNormalBounds();
+  return frame_->GetRestoredBounds();
 }
 
 gfx::Rect BrowserView::GetBounds() const {
-  return frame_->GetBounds();
+  return frame_->GetWindowScreenBounds();
 }
 
 bool BrowserView::IsMaximized() const {
   return frame_->IsMaximized();
 }
 
 void BrowserView::SetFullscreen(bool fullscreen) {
   if (IsFullscreen() == fullscreen)
     return;  // Nothing to do.
 
@@ skipping 226 matching lines @@
 #if defined(OS_WIN)
   DefaultSearchView::Show(tab_contents, template_url, template_url_service);
 #else
   // TODO(levin): Implement for other platforms. Right now this is behind
   // a command line flag which is off. http://crbug.com/38475
 #endif
 }
 
 void BrowserView::ConfirmAddSearchProvider(const TemplateURL* template_url,
                                            Profile* profile) {
-  browser::EditSearchEngine(GetWindow()->GetNativeWindow(), template_url, NULL,
+  browser::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL,
                             profile);
 }
 
 void BrowserView::ToggleBookmarkBar() {
   bookmark_utils::ToggleWhenVisible(browser_->profile());
 }
 
 void BrowserView::ShowAboutChromeDialog() {
   DoShowAboutChromeDialog();
 }
 
 views::Window* BrowserView::DoShowAboutChromeDialog() {
-  return browser::ShowAboutChromeView(GetWindow()->GetNativeWindow(),
+  return browser::ShowAboutChromeView(GetWidget()->GetNativeWindow(),
                                       browser_->profile());
 }
 
 void BrowserView::ShowUpdateChromeDialog() {
-  UpdateRecommendedMessageBox::ShowMessageBox(GetWindow()->GetNativeWindow());
+  UpdateRecommendedMessageBox::ShowMessageBox(GetWidget()->GetNativeWindow());
 }
 
 void BrowserView::ShowCompactLocationBarUnderSelectedTab() {
   if (!UseCompactNavigationBar())
     return;
   compact_location_bar_view_host_->UpdateOnTabChange(browser()->active_index(),
                                                      true);
 }
 
 void BrowserView::ShowTaskManager() {
@@ skipping 93 matching lines @@
 }
 
 void BrowserView::TabContentsFocused(TabContents* tab_contents) {
   contents_container_->TabContentsFocused(tab_contents);
 }
 
 void BrowserView::ShowPageInfo(Profile* profile,
                                const GURL& url,
                                const NavigationEntry::SSLStatus& ssl,
                                bool show_history) {
-  gfx::NativeWindow parent = GetWindow()->GetNativeWindow();
+  gfx::NativeWindow parent = GetWidget()->GetNativeWindow();
 
   browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history);
 }
 
 void BrowserView::ShowAppMenu() {
   // TODO(mad): find out how to add this to compact nav view.
   toolbar_->app_menu()->Activate();
 }
 
 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
@@ skipping 407 matching lines @@
 }
 
 bool BrowserView::ShouldShowWindowIcon() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 bool BrowserView::ExecuteWindowsCommand(int command_id) {
   // This function handles WM_SYSCOMMAND, WM_APPCOMMAND, and WM_COMMAND.
 #if defined(OS_WIN)
   if (command_id == IDC_DEBUG_FRAME_TOGGLE)
-    GetWindow()->DebugToggleFrameType();
+    GetWidget()->DebugToggleFrameType();
 #endif
   // Translate WM_APPCOMMAND command ids into a command id that the browser
   // knows how to handle.
   int command_id_from_app_command = GetCommandIDForAppCommandID(command_id);
   if (command_id_from_app_command != -1)
     command_id = command_id_from_app_command;
 
   return browser_->ExecuteCommandIfEnabled(command_id);
 }
 
@@ skipping 53 matching lines @@
 
 bool BrowserView::GetSavedMaximizedState(bool* maximized) const {
   *maximized = browser_->GetSavedMaximizedState();
   return true;
 }
 
 views::View* BrowserView::GetContentsView() {
   return contents_container_;
 }
 
-views::ClientView* BrowserView::CreateClientView(views::Window* window) {
-  set_window(window);
+views::ClientView* BrowserView::CreateClientView(views::Widget* widget) {
   return this;
 }
 
 void BrowserView::OnWindowActivationChanged(bool active) {
   if (active) {
     BrowserList::SetLastActive(browser_.get());
     browser_->OnWindowActivated();
   }
 }
 
@@ skipping 911 matching lines @@
     contents_container_->ChangeTabContents(new_contents->tab_contents());
   UpdateSidebarForContents(new_contents);
 
   UpdateDevToolsForContents(new_contents);
   // TODO(beng): This should be called automatically by ChangeTabContents, but I
   //             am striving for parity now rather than cleanliness. This is
   //             required to make features like Duplicate Tab, Undo Close Tab,
   //             etc not result in sad tab.
   new_contents->tab_contents()->DidBecomeSelected();
   if (BrowserList::GetLastActive() == browser_ &&
-      !browser_->tabstrip_model()->closing_all() && GetWindow()->IsVisible()) {
+      !browser_->tabstrip_model()->closing_all() && GetWidget()->IsVisible()) {
     // We only restore focus if our window is visible, to avoid invoking blur
     // handlers when we are eventually shown.
     new_contents->view()->RestoreFocus();
   }
 
   // Update all the UI bits.
   UpdateTitleBar();
   // No need to update Toolbar because it's already updated in
   // browser.cc.
 }
@@ skipping 14 matching lines @@
   }
 }
 
 #if !defined(OS_CHROMEOS)
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
   BrowserView* view = new BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
-  view->GetWindow()->non_client_view()->SetAccessibleName(
+  view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }