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

chrome/browser/window_sizer.cc

 // Copyright (c) 2006-2008 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/window_sizer.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 
@@ skipping 23 matching lines @@
 
   virtual gfx::Rect GetPrimaryMonitorBounds() const {
     return gfx::Rect(GetMonitorInfoForMonitor(MonitorFromWindow(NULL,
         MONITOR_DEFAULTTOPRIMARY)).rcMonitor);
   }
 
   virtual gfx::Rect GetMonitorWorkAreaMatching(
       const gfx::Rect& match_rect) const {
     CRect other_bounds_crect = match_rect.ToRECT();
     MONITORINFO monitor_info = GetMonitorInfoForMonitor(MonitorFromRect(
-        &other_bounds_crect, MONITOR_DEFAULTTOPRIMARY));
+        &other_bounds_crect, MONITOR_DEFAULTTONEAREST));
     return gfx::Rect(monitor_info.rcWork);
   }
 
   virtual gfx::Point GetBoundsOffsetMatching(
       const gfx::Rect& match_rect) const {
     CRect other_bounds_crect = match_rect.ToRECT();
     MONITORINFO monitor_info = GetMonitorInfoForMonitor(MonitorFromRect(
-        &other_bounds_crect, MONITOR_DEFAULTTOPRIMARY));
+        &other_bounds_crect, MONITOR_DEFAULTTONEAREST));
     return gfx::Point(monitor_info.rcWork.left - monitor_info.rcMonitor.left,
                       monitor_info.rcWork.top - monitor_info.rcMonitor.top);
   }
 
   void UpdateWorkAreas() {
     work_areas_.clear();
     EnumDisplayMonitors(NULL, NULL,
                         &DefaultMonitorInfoProvider::MonitorEnumProc,
                         reinterpret_cast<LPARAM>(&work_areas_));
   }
@@ skipping 60 matching lines @@
   virtual bool GetLastActiveWindowState(gfx::Rect* bounds) const {
     // Applications are always restored with the same position.
     if (!app_name_.empty())
       return false;
 
     BrowserList::const_reverse_iterator it = BrowserList::begin_last_active();
     BrowserList::const_reverse_iterator end = BrowserList::end_last_active();
     for (; it != end; ++it) {
       Browser* last_active = *it;
       if (last_active && last_active->type() == Browser::TYPE_NORMAL) {
-        BrowserWindow* frame = last_active->window();
-        DCHECK(frame);
-        *bounds = frame->GetNormalBounds();
+        BrowserWindow* window = last_active->window();
+        DCHECK(window);
+        *bounds = window->GetNormalBounds();
         return true;
       }
     }
 
     return false;
   }
 
  private:
   std::wstring app_name_;
 
@@ skipping 207 matching lines @@
   // Now that we've tried to correct the x/y position to something reasonable,
   // see if the window is still too tall or wide to fit, and resize it if need
   // be.
   if ((bottom_offscreen || top_offscreen) &&
       bounds->bottom() > work_area.bottom())
     bounds->set_height(work_area.height() - 2 * kWindowTilePixels);
   if ((left_offscreen || right_offscreen) &&
       bounds->right() > work_area.right())
     bounds->set_width(work_area.width() - 2 * kWindowTilePixels);
 }