Reorganize fullscreen mode handling. Now nearly everything is in WindowWin. ...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2009 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/views/frame/browser_view.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 41 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 #include "chrome/views/fill_layout.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/hwnd_notification_source.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
+#include "chrome/views/window/window_win.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
 
 
 using base::TimeDelta;
 
 // static
 SkBitmap BrowserView::default_favicon_;
@@ skipping 56 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // ResizeCorner, private:
 
 class ResizeCorner : public views::View {
  public:
   ResizeCorner() { }
 
   virtual void Paint(ChromeCanvas* canvas) {
-    BrowserView* browser = GetBrowserView();
-    if (browser && !browser->CanCurrentlyResize())
+    views::WindowWin* window = GetWindow();
+    if (!window || (window->IsMaximized() || window->IsFullscreen()))
       return;
 
     SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_TEXTAREA_RESIZER);
     bitmap->buildMipMap(false);
     bool rtl_dir = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
     if (rtl_dir) {
       canvas->TranslateInt(width(), 0);
       canvas->ScaleInt(-1, 1);
       canvas->save();
     }
     canvas->DrawBitmapInt(*bitmap, width() - bitmap->width(),
                           height() - bitmap->height());
     if (rtl_dir)
       canvas->restore();
   }
 
   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...
     // return gfx::Size(views::NativeScrollBar::GetVerticalScrollBarWidth(),
     //     views::NativeScrollBar::GetHorizontalScrollBarHeight());
     return gfx::Size();
   }
 
   virtual gfx::Size GetPreferredSize() {
-    BrowserView* browser = GetBrowserView();
-    return (browser && !browser->CanCurrentlyResize()) ?
+    views::WindowWin* window = GetWindow();
+    return (!window || window->IsMaximized() || window->IsFullscreen()) ?
         gfx::Size() : GetSize();
   }
 
   virtual void Layout() {
     views::View* parent_view = GetParent();
     if (parent_view) {
       gfx::Size ps = GetPreferredSize();
       // No need to handle Right to left text direction here,
       // our parent must take care of it for us...
       SetBounds(parent_view->width() - ps.width(),
                 parent_view->height() - ps.height(), ps.width(), ps.height());
     }
   }
 
  private:
-  // Returns the BrowserView we're displayed in. Returns NULL if we're not
-  // currently in a browser view.
-  BrowserView* GetBrowserView() {
-    View* browser = GetAncestorWithClassName(kBrowserViewClassName);
-    return browser ? static_cast<BrowserView*>(browser) : NULL;
+  // Returns the WindowWin we're displayed in. Returns NULL if we're not
+  // currently in a window.
+  views::WindowWin* GetWindow() {
+    views::Widget* widget = GetWidget();
+    return widget ? static_cast<views::WindowWin*>(widget) : NULL;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ResizeCorner);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // DownloadInProgressConfirmDialogDelegate
 
 class DownloadInProgressConfirmDialogDelegate : public views::DialogDelegate,
                                                 public views::View {
@@ skipping 71 matching lines @@
       frame_(NULL),
       browser_(browser),
       active_bookmark_bar_(NULL),
       active_download_shelf_(NULL),
       tabstrip_(NULL),
       toolbar_(NULL),
       infobar_container_(NULL),
       find_bar_y_(0),
       contents_container_(NULL),
       initialized_(false),
-      fullscreen_(false),
       ignore_layout_(false),
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0)
 #ifdef CHROME_PERSONALIZATION
       , personalization_enabled_(false),
       personalization_(NULL)
 #endif
       {
   InitClass();
   browser_->tabstrip_model()->AddObserver(this);
@@ skipping 42 matching lines @@
   if (toolbar_->GetLocationBarView())
     toolbar_->GetLocationBarView()->location_entry()->ClosePopup();
 }
 
 void BrowserView::WindowMoveOrResizeStarted() {
   TabContents* tab_contents = GetSelectedTabContents();
   if (tab_contents && tab_contents->AsWebContents())
     tab_contents->AsWebContents()->WindowMoveOrResizeStarted();
 }
 
-bool BrowserView::CanCurrentlyResize() const {
-  return !IsMaximized() && !IsFullscreen();
-}
-
 gfx::Rect BrowserView::GetToolbarBounds() const {
   return toolbar_->bounds();
 }
 
 gfx::Rect BrowserView::GetClientAreaBounds() const {
   gfx::Rect container_bounds = contents_container_->bounds();
   gfx::Point container_origin = container_bounds.origin();
   ConvertPointToView(this, GetParent(), &container_origin);
   container_bounds.set_origin(container_origin);
   return container_bounds;
@@ skipping 239 matching lines @@
       LoadingAnimationCallback();
     }
   }
 }
 
 void BrowserView::SetStarredState(bool is_starred) {
   toolbar_->star_button()->SetToggled(is_starred);
 }
 
 gfx::Rect BrowserView::GetNormalBounds() const {
-  // If we're in fullscreen mode, we've changed the normal bounds to the monitor
-  // rect, so return the saved bounds instead.
-  if (fullscreen_)
-    return gfx::Rect(saved_window_info_.window_rect);
-
-  WINDOWPLACEMENT wp;
-  wp.length = sizeof(wp);
-  const bool ret = !!GetWindowPlacement(frame_->GetNativeView(), &wp);
-  DCHECK(ret);
-  return gfx::Rect(wp.rcNormalPosition);
+  return frame_->GetNormalBounds();
 }
 
 bool BrowserView::IsMaximized() const {
   return frame_->IsMaximized();
 }
 
 void BrowserView::SetFullscreen(bool fullscreen) {
-  if (fullscreen_ == fullscreen)
+  if (IsFullscreen() == fullscreen)
     return;  // Nothing to do.
 
-  // Move focus out of the location bar if necessary.
-  LocationBarView* location_bar = toolbar_->GetLocationBarView();
-  if (!fullscreen_) {
-    views::FocusManager* focus_manager = GetFocusManager();
-    DCHECK(focus_manager);
-    if (focus_manager->GetFocusedView() == location_bar)
-      focus_manager->ClearFocus();
-  }
-  AutocompleteEditViewWin* edit_view =
-      static_cast<AutocompleteEditViewWin*>(location_bar->location_entry());
-
-  // Toggle fullscreen mode.
-  fullscreen_ = fullscreen;
-
   // Reduce jankiness during the following position changes by:
   //   * Hiding the window until it's in the final position
   //   * Ignoring all intervening Layout() calls, which resize the webpage and
   //     thus are slow and look ugly
   ignore_layout_ = true;
-  frame_->set_force_hidden(true);
-  if (fullscreen_) {
+  LocationBarView* location_bar = toolbar_->GetLocationBarView();
+  AutocompleteEditViewWin* edit_view =
+      static_cast<AutocompleteEditViewWin*>(location_bar->location_entry());
+  if (IsFullscreen()) {
+    // Hide the fullscreen bubble as soon as possible, since the mode toggle can
+    // take enough time for the user to notice.
+    fullscreen_bubble_.reset();
+  } else {
+    // Move focus out of the location bar if necessary.
+    views::FocusManager* focus_manager = GetFocusManager();
+    DCHECK(focus_manager);
+    if (focus_manager->GetFocusedView() == location_bar)
+      focus_manager->ClearFocus();
+
     // If we don't hide the edit and force it to not show until we come out of
     // fullscreen, then if the user was on the New Tab Page, the edit contents
     // will appear atop the web contents once we go into fullscreen mode.  This
     // has something to do with how we move the main window while it's hidden;
     // if we don't hide the main window below, we don't get this problem.
     edit_view->set_force_hidden(true);
     ShowWindow(edit_view->m_hWnd, SW_HIDE);
   }
-  frame_->Hide();
+  frame_->PushForceHidden();
 
   // Notify bookmark bar, so it can set itself to the appropriate drawing state.
   if (bookmark_bar_view_.get())
-    bookmark_bar_view_->OnFullscreenToggled(fullscreen_);
+    bookmark_bar_view_->OnFullscreenToggled(fullscreen);
 
-  // Size/position/style window appropriately.
-  views::Widget* widget = GetWidget();
-  HWND hwnd = widget->GetNativeView();
-  MONITORINFO monitor_info;
-  monitor_info.cbSize = sizeof(monitor_info);
-  GetMonitorInfo(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY),
-                 &monitor_info);
-  gfx::Rect monitor_rect(monitor_info.rcMonitor);
-  if (fullscreen_) {
-    // Save current window information.  We force the window into restored mode
-    // before going fullscreen because Windows doesn't seem to hide the
-    // taskbar if the window is in the maximized state.
-    saved_window_info_.maximized = IsMaximized();
-    if (saved_window_info_.maximized)
-      frame_->ExecuteSystemMenuCommand(SC_RESTORE);
-    saved_window_info_.style = GetWindowLong(hwnd, GWL_STYLE);
-    saved_window_info_.ex_style = GetWindowLong(hwnd, GWL_EXSTYLE);
-    GetWindowRect(hwnd, &saved_window_info_.window_rect);
+  // Toggle fullscreen mode.
+  frame_->SetFullscreen(fullscreen);
 
-    // Set new window style and size.
-    SetWindowLong(hwnd, GWL_STYLE,
-                  saved_window_info_.style & ~(WS_CAPTION | WS_THICKFRAME));
-    SetWindowLong(hwnd, GWL_EXSTYLE,
-                  saved_window_info_.ex_style & ~(WS_EX_DLGMODALFRAME |
-                  WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE));
-    SetWindowPos(hwnd, NULL, monitor_rect.x(), monitor_rect.y(),
-                 monitor_rect.width(), monitor_rect.height(),
-                 SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
-
-    fullscreen_bubble_.reset(new FullscreenExitBubble(widget, browser_.get()));
+  if (IsFullscreen()) {
+    fullscreen_bubble_.reset(new FullscreenExitBubble(frame_, browser_.get()));
   } else {
-    // Hide the fullscreen bubble as soon as possible, since the calls below can
-    // take enough time for the user to notice.
-    fullscreen_bubble_.reset();
-
-    // Reset original window style and size.  The multiple window size/moves
-    // here are ugly, but if SetWindowPos() doesn't redraw, the taskbar won't be
-    // repainted.  Better-looking methods welcome.
-    gfx::Rect new_rect(saved_window_info_.window_rect);
-    SetWindowLong(hwnd, GWL_STYLE, saved_window_info_.style);
-    SetWindowLong(hwnd, GWL_EXSTYLE, saved_window_info_.ex_style);
-    SetWindowPos(hwnd, NULL, new_rect.x(), new_rect.y(), new_rect.width(),
-                 new_rect.height(),
-                 SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
-    if (saved_window_info_.maximized)
-      frame_->ExecuteSystemMenuCommand(SC_MAXIMIZE);
-
     // Show the edit again since we're no longer in fullscreen mode.
     edit_view->set_force_hidden(false);
     ShowWindow(edit_view->m_hWnd, SW_SHOW);
   }
 
   // Undo our anti-jankiness hacks and force the window to relayout now that
   // it's in its final position.
   ignore_layout_ = false;
   Layout();
-  frame_->set_force_hidden(false);
-  ShowWindow(hwnd, SW_SHOW);
+  frame_->PopForceHidden();
 }
 
 bool BrowserView::IsFullscreen() const {
-  return fullscreen_;
+  return frame_->IsFullscreen();
 }
 
 LocationBar* BrowserView::GetLocationBar() const {
   return toolbar_->GetLocationBarView();
 }
 
 void BrowserView::SetFocusToLocationBar() {
   LocationBarView* location_bar = toolbar_->GetLocationBarView();
   if (location_bar->IsFocusable()) {
     location_bar->FocusLocation();
@@ skipping 32 matching lines @@
   browser_.reset();
 }
 
 bool BrowserView::IsBookmarkBarVisible() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR) &&
       active_bookmark_bar_ &&
       (active_bookmark_bar_->GetPreferredSize().height() != 0);
 }
 
 gfx::Rect BrowserView::GetRootWindowResizerRect() const {
-  if (!CanCurrentlyResize())
+  if (frame_->IsMaximized() || frame_->IsFullscreen())
     return gfx::Rect();
 
   // We don't specify a resize corner size if we have a bottom shelf either.
   // This is because we take care of drawing the resize corner on top of that
   // shelf, so we don't want others to do it for us in this case.
   // Currently, the only visible bottom shelf is the download shelf.
   // Other tests should be added here if we add more bottom shelves.
   TabContents* current_tab = browser_->GetSelectedTabContents();
   if (current_tab && current_tab->IsDownloadShelfVisible()) {
     DownloadShelf* download_shelf = current_tab->GetDownloadShelf();
@@ skipping 260 matching lines @@
   return false;
 }
 
 std::wstring BrowserView::GetWindowName() const {
   return browser_->GetWindowPlacementKey();
 }
 
 void BrowserView::SaveWindowPlacement(const gfx::Rect& bounds,
                                       bool maximized,
                                       bool always_on_top) {
-  // If fullscreen_ is true, we've just changed into fullscreen mode, and we're
-  // catching the going-into-fullscreen sizing and positioning calls, which we
-  // want to ignore.
-  if (!fullscreen_ && browser_->ShouldSaveWindowPlacement()) {
+  // If IsFullscreen() is true, we've just changed into fullscreen mode, and
+  // we're catching the going-into-fullscreen sizing and positioning calls,
+  // which we want to ignore.
+  if (!IsFullscreen() && browser_->ShouldSaveWindowPlacement()) {
     WindowDelegate::SaveWindowPlacement(bounds, maximized, always_on_top);
     browser_->SaveWindowPlacement(bounds, maximized);
   }
 }
 
 bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const {
   *bounds = browser_->GetSavedWindowBounds();
   if (browser_->type() & Browser::TYPE_POPUP) {
     // We are a popup window. The value passed in |bounds| represents two
     // pieces of information:
@@ skipping 75 matching lines @@
       NotificationService::NoDetails());
   return true;
 }
 
 int BrowserView::NonClientHitTest(const gfx::Point& point) {
   // Since the TabStrip only renders in some parts of the top of the window,
   // the un-obscured area is considered to be part of the non-client caption
   // area of the window. So we need to treat hit-tests in these regions as
   // hit-tests of the titlebar.
 
-  if (CanCurrentlyResize()) {
+  if (!frame_->IsMaximized() && !frame_->IsFullscreen()) {
     CRect client_rect;
     ::GetClientRect(frame_->GetNativeView(), &client_rect);
     gfx::Size resize_corner_size = ResizeCorner::GetSize();
     gfx::Rect resize_corner_rect(client_rect.right - resize_corner_size.width(),
         client_rect.bottom - resize_corner_size.height(),
         resize_corner_size.width(), resize_corner_size.height());
     bool rtl_dir = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
     if (rtl_dir)
       resize_corner_rect.set_x(0);
     if (resize_corner_rect.Contains(point)) {
@@ skipping 513 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserView* browser_view = new BrowserView(browser);
   (new BrowserFrame(browser_view))->Init();
   return browser_view;
 }
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return new FindBarWin(static_cast<BrowserView*>(browser->window()));
 }