Merge r11401....

chrome/views/window.h

 // 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.
 
 #ifndef CHROME_VIEWS_WINDOW_H__
 #define CHROME_VIEWS_WINDOW_H__
 
 #include "chrome/common/notification_registrar.h"
 #include "chrome/views/client_view.h"
 #include "chrome/views/non_client_view.h"
@@ skipping 98 matching lines @@
   virtual void UpdateFrameAfterFrameChange();
 
   // Accessors and setters for various properties.
   WindowDelegate* window_delegate() const { return window_delegate_; }
   HWND owning_window() const { return owning_hwnd_; }
   ClientView* client_view() const { return non_client_view_->client_view(); }
   bool is_active() const { return is_active_; }
   void set_focus_on_creation(bool focus_on_creation) {
     focus_on_creation_ = focus_on_creation;
   }
+  void set_force_hidden(bool force_hidden) { force_hidden_ = force_hidden; }
 
   // Returns the preferred size of the contents view of this window based on
   // its localized size data. The width in cols is held in a localized string
   // resource identified by |col_resource_id|, the height in the same fashion.
   // TODO(beng): This should eventually live somewhere else, probably closer to
   //             ClientView.
   static int GetLocalizedContentsWidth(int col_resource_id);
   static int GetLocalizedContentsHeight(int row_resource_id);
   static gfx::Size GetLocalizedContentsSize(int col_resource_id,
                                             int row_resource_id);
@@ skipping 42 matching lines @@
   virtual void OnNCPaint(HRGN rgn);
   virtual void OnNCLButtonDown(UINT ht_component, const CPoint& point);
   virtual void OnNCRButtonDown(UINT ht_component, const CPoint& point);
   virtual LRESULT OnNCUAHDrawCaption(UINT msg, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnNCUAHDrawFrame(UINT msg, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnSetCursor(HWND window, UINT hittest_code, UINT message);
   virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon);
   virtual LRESULT OnSetText(const wchar_t* text);
   virtual void OnSize(UINT size_param, const CSize& new_size);
   virtual void OnSysCommand(UINT notification_code, CPoint click);
+  virtual void OnWindowPosChanging(WINDOWPOS* window_pos);
   virtual Window* AsWindow() { return this; }
   virtual const Window* AsWindow() const { return this; }
 
   // The View that provides the non-client area of the window (title bar,
   // window controls, sizing borders etc). To use an implementation other than
   // the default, this class must be subclassed and this value set to the
   // desired implementation before calling |Init|.
   NonClientView* non_client_view_;
 
   // Accessor for disable_inactive_rendering_.
@@ skipping 106 matching lines @@
   // True if updates to this window are currently locked.
   bool lock_updates_;
 
   // The window styles of the window before updates were locked.
   DWORD saved_window_style_;
 
   // The saved maximized state for this window. See note in SetInitialBounds
   // that explains why we save this.
   bool saved_maximized_state_;
 
+  // True if we should prevent attempts to make the window visible when we
+  // handle WM_WINDOWPOSCHANGING. Some calls like ShowWindow(SW_RESTORE) make
+  // the window visible in addition to restoring it, when all we want to do is
+  // restore it.
+  bool force_hidden_;
+
   // Hold onto notifications.
   NotificationRegistrar notification_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace views
 
 #endif  // CHROME_VIEWS_WINDOW_H__