Merge 121180 - views / Windows: A child window should be centered with respect to its parent, not t…

ui/base/win/hwnd_util.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 UI_BASE_WIN_HWND_UTIL_H_
 #define UI_BASE_WIN_HWND_UTIL_H_
 #pragma once
 
 #include <windows.h>
 
 #include "base/string16.h"
@@ skipping 14 matching lines @@
 
 // Pointer-friendly wrappers around Get/SetWindowLong(..., GWLP_USERDATA, ...)
 // Returns the previously set value.
 UI_EXPORT void* SetWindowUserData(HWND hwnd, void* user_data);
 UI_EXPORT void* GetWindowUserData(HWND hwnd);
 
 // Returns true if the specified window is the current active top window or one
 // of its children.
 UI_EXPORT bool DoesWindowBelongToActiveWindow(HWND window);
 
-// Sizes the window to have a client or window size (depending on the value of
-// |pref_is_client|) of pref, then centers the window over parent, ensuring the
-// window fits on screen.
+// Sizes the window to have a window size of |pref|, then centers the window
+// over |parent|, ensuring the window fits on screen.
 UI_EXPORT void CenterAndSizeWindow(HWND parent,
                                    HWND window,
-                                   const gfx::Size& pref,
-                                   bool pref_is_client);
+                                   const gfx::Size& pref);
 
 // If |hwnd| is NULL logs various thing and CHECKs. Invoke right after calling
 // CreateWindow.
 UI_EXPORT void CheckWindowCreated(HWND hwnd);
 
 // Shows the system menu for |window| and sends the selected command (if the
 // user selected something.
 UI_EXPORT void ShowSystemMenu(HWND window, int screen_x, int screen_y);
 
 }  // namespace ui
 
 #endif  // UI_BASE_WIN_HWND_UTIL_H_