Removes an unused boolean passed to MoveToFront.

chrome/views/widget/widget_win.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/widget/widget_win.h"
 
 #include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/accessibility/view_accessibility.h"
 #include "chrome/views/controls/native_control_win.h"
 #include "chrome/views/fill_layout.h"
 #include "chrome/views/focus/focus_util_win.h"
 #include "chrome/views/widget/aero_tooltip_manager.h"
 #include "chrome/views/widget/hwnd_notification_source.h"
 #include "chrome/views/widget/root_view.h"
+#include "chrome/views/window/window_win.h"
 
 namespace views {
 
 static const DWORD kWindowDefaultChildStyle =
     WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 static const DWORD kWindowDefaultStyle = WS_OVERLAPPEDWINDOW;
 static const DWORD kWindowDefaultExStyle = 0;
 
 // Property used to link the HWND to its RootView.
 static const wchar_t* const kRootViewWindowProperty = L"__ROOT_VIEW__";
@@ skipping 107 matching lines @@
       has_capture_(false),
       current_action_(FA_NONE),
       window_style_(0),
       window_ex_style_(kWindowDefaultExStyle),
       use_layered_buffer_(true),
       layered_alpha_(255),
       delete_on_destroy_(true),
       can_update_layered_window_(true),
       last_mouse_event_was_move_(false),
       is_mouse_down_(false),
+      is_window_(false),
       class_style_(CS_DBLCLKS),
       hwnd_(NULL) {
 }
 
 WidgetWin::~WidgetWin() {
   MessageLoopForUI::current()->RemoveObserver(this);
 }
 
 void WidgetWin::Init(HWND parent, const gfx::Rect& bounds,
                      bool has_own_focus_manager) {
@@ skipping 87 matching lines @@
     return;
   }
 
   GetClientRect(&crect);
   POINT p = {0, 0};
   ::ClientToScreen(hwnd_, &p);
   out->SetRect(crect.left + p.x, crect.top + p.y,
                crect.Width(), crect.Height());
 }
 
-void WidgetWin::MoveToFront(bool should_activate) {
-  int flags = SWP_NOMOVE | SWP_NOSIZE;
-  if (!should_activate) {
-    flags |= SWP_NOACTIVATE;
-  }
-
-  // Keep the window topmost if it was already topmost.
-  WINDOWINFO wi;
-  wi.cbSize = sizeof WINDOWINFO;
-  GetWindowInfo(GetNativeView(), &wi);
-  SetWindowPos((wi.dwExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST,
-               0, 0, 0, 0, flags);
-}
-
 gfx::NativeView WidgetWin::GetNativeView() const {
   return hwnd_;
 }
 
 void WidgetWin::PaintNow(const gfx::Rect& update_rect) {
   if (use_layered_buffer_) {
     PaintLayeredWindow();
   } else if (root_view_->NeedsPainting(false) && IsWindow()) {
     if (!opaque_ && GetParent()) {
       // We're transparent. Need to force painting to occur from our parent.
@@ skipping 33 matching lines @@
 }
 
 bool WidgetWin::IsActive() const {
   return win_util::IsWindowActive(GetNativeView());
 }
 
 TooltipManager* WidgetWin::GetTooltipManager() {
   return tooltip_manager_.get();
 }
 
+Window* WidgetWin::GetWindow() {
+  return GetWindowImpl(hwnd_);
+}
+
+const Window* WidgetWin::GetWindow() const {
+  return GetWindowImpl(hwnd_);
+}
 
 void WidgetWin::SetLayeredAlpha(BYTE layered_alpha) {
   layered_alpha_ = layered_alpha;
 
 //  if (hwnd_)
 //    UpdateWindowFromContents(contents_->getTopPlatformDevice().getBitmapDC());
 }
 
 void WidgetWin::SetUseLayeredBuffer(bool use_layered_buffer) {
   if (use_layered_buffer_ == use_layered_buffer)
@@ skipping 511 matching lines @@
     PaintNow(gfx::Rect(rect));
 }
 
 RootView* WidgetWin::CreateRootView() {
   return new RootView(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WidgetWin, private:
 
+// static
+Window* WidgetWin::GetWindowImpl(HWND hwnd) {
+  // NOTE: we can't use GetAncestor here as constrained windows are a Window,
+  // but not a top level window.
+  HWND parent = hwnd;
+  while (parent) {
+    WidgetWin* widget =
+        reinterpret_cast<WidgetWin*>(win_util::GetWindowUserData(parent));
+    if (widget && widget->is_window_)
+      return static_cast<WindowWin*>(widget);
+    parent = ::GetParent(parent);
+  }
+  return NULL;
+}
+
 void WidgetWin::SizeContents(const CRect& window_rect) {
   contents_.reset(new ChromeCanvas(window_rect.Width(),
                                    window_rect.Height(),
                                    false));
 }
 
 void WidgetWin::PaintLayeredWindow() {
   // Painting monkeys with our cliprect, so we need to save it so that the
   // call to UpdateLayeredWindow updates the entire window, not just the
   // cliprect.
@@ skipping 125 matching lines @@
     result = DefWindowProc(window, message, w_param, l_param);
   if (message == WM_NCDESTROY) {
     TRACK_HWND_DESTRUCTION(window);
     widget->hwnd_ = NULL;
     widget->OnFinalMessage(window);
   }
   return result;
 }
 
 }  // namespace views