Merge r11401....

chrome/views/window.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/views/window.h"
 
 #include <shellapi.h>
 
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 306 matching lines @@
       owning_hwnd_(NULL),
       minimum_size_(100, 100),
       is_modal_(false),
       restored_enabled_(false),
       is_always_on_top_(false),
       window_closed_(false),
       disable_inactive_rendering_(false),
       is_active_(false),
       lock_updates_(false),
       saved_window_style_(0),
-      saved_maximized_state_(0) {
+      saved_maximized_state_(0),
+      force_hidden_(false) {
   InitClass();
   DCHECK(window_delegate_);
   window_delegate_->window_.reset(this);
   // Initialize these values to 0 so that subclasses can override the default
   // behavior before calling Init.
   set_window_style(0);
   set_window_ex_style(0);
 }
 
 void Window::Init(HWND parent, const gfx::Rect& bounds) {
@@ skipping 304 matching lines @@
                     bounds.top - clip_state->y,
                     bounds.right - clip_state->x,
                     bounds.bottom - clip_state->y);
   }
   return TRUE;
 }
 }  // namespace
 
 void Window::OnNCPaint(HRGN rgn) {
   // We only do non-client painting if we're not using the native frame.
-  if (non_client_view_->UseNativeFrame())
-    return WidgetWin::OnNCPaint(rgn);
+  if (non_client_view_->UseNativeFrame()) {
+    WidgetWin::OnNCPaint(rgn);
+    return;
+  }
 
   // We have an NC region and need to paint it. We expand the NC region to
   // include the dirty region of the root view. This is done to minimize
   // paints.
   CRect window_rect;
   GetWindowRect(&window_rect);
 
   if (window_rect.Width() != root_view_->width() ||
       window_rect.Height() != root_view_->height()) {
     // If the size of the window differs from the size of the root view it
@@ skipping 245 matching lines @@
   } else if ((notification_code == SC_KEYMENU) && (click.x == VK_SPACE)) {
     // Run the system menu at the NonClientView's desired location.
     RunSystemMenu(non_client_view_->GetSystemMenuPoint());
   } else {
     // Use the default implementation for any other command.
     DefWindowProc(GetHWND(), WM_SYSCOMMAND, notification_code,
                   MAKELPARAM(click.y, click.x));
   }
 }
 
+void Window::OnWindowPosChanging(WINDOWPOS* window_pos) {
+  if (force_hidden_) {
+    // Prevent the window from being made visible if we've been asked to do so.
+    // See comment in header as to why we might want this.
+    window_pos->flags &= ~SWP_SHOWWINDOW;
+  }
+  WidgetWin::OnWindowPosChanging(window_pos);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Window, private:
 
 void Window::BecomeModal() {
   // We implement modality by crawling up the hierarchy of windows starting
   // at the owner, disabling all of them so that they don't receive input
   // messages.
   DCHECK(owning_hwnd_) << "Can't create a modal dialog without an owner";
   HWND start = owning_hwnd_;
   while (start != NULL) {
@@ skipping 243 matching lines @@
     resize_cursors_[RC_VERTICAL] = LoadCursor(NULL, IDC_SIZENS);
     resize_cursors_[RC_HORIZONTAL] = LoadCursor(NULL, IDC_SIZEWE);
     resize_cursors_[RC_NESW] = LoadCursor(NULL, IDC_SIZENESW);
     resize_cursors_[RC_NWSE] = LoadCursor(NULL, IDC_SIZENWSE);
     initialized = true;
   }
 }
 
 }  // namespace views