Revert 284850 "aura: Use PlatformWindow from WindowTreeHostWin."

trunk/src/ui/platform_window/win/win_window.cc

 // Copyright 2014 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 "ui/platform_window/win/win_window.h"
 
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/win/msg_util.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 namespace {
 
-bool use_popup_as_root_window_for_test = false;
-
 gfx::Rect GetWindowBoundsForClientBounds(DWORD style, DWORD ex_style,
                                          const gfx::Rect& bounds) {
   RECT wr;
   wr.left = bounds.x();
   wr.top = bounds.y();
   wr.right = bounds.x() + bounds.width();
   wr.bottom = bounds.y() + bounds.height();
   AdjustWindowRectEx(&wr, style, FALSE, ex_style);
 
   // Make sure to keep the window onscreen, as AdjustWindowRectEx() may have
   // moved part of it offscreen.
   gfx::Rect window_bounds(wr.left, wr.top,
                           wr.right - wr.left, wr.bottom - wr.top);
   window_bounds.set_x(std::max(0, window_bounds.x()));
   window_bounds.set_y(std::max(0, window_bounds.y()));
   return window_bounds;
 }
 
 }  // namespace
 
 WinWindow::WinWindow(PlatformWindowDelegate* delegate,
                      const gfx::Rect& bounds)
     : delegate_(delegate) {
   CHECK(delegate_);
-  if (use_popup_as_root_window_for_test)
-    set_window_style(WS_POPUP);
   gfx::Rect window_bounds = GetWindowBoundsForClientBounds(
       WS_OVERLAPPEDWINDOW, window_ex_style(), bounds);
   gfx::WindowImpl::Init(NULL, window_bounds);
   SetWindowText(hwnd(), L"WinWindow");
 }
 
 WinWindow::~WinWindow() {
   Destroy();
 }
 
@@ skipping 69 matching lines @@
 
 LRESULT WinWindow::OnKeyEvent(UINT message, WPARAM w_param, LPARAM l_param) {
   MSG msg = { hwnd(), message, w_param, l_param };
   KeyEvent event(msg, message == WM_CHAR);
   delegate_->DispatchEvent(&event);
   SetMsgHandled(event.handled());
   return 0;
 }
 
 LRESULT WinWindow::OnNCActivate(UINT message, WPARAM w_param, LPARAM l_param) {
-  delegate_->OnActivationChanged(!!w_param);
   return DefWindowProc(hwnd(), message, w_param, l_param);
 }
 
 void WinWindow::OnClose() {
   delegate_->OnCloseRequest();
 }
 
 LRESULT WinWindow::OnCreate(CREATESTRUCT* create_struct) {
   delegate_->OnAcceleratedWidgetAvailable(hwnd());
   return 0;
@@ skipping 16 matching lines @@
   if (!(window_pos->flags & SWP_NOSIZE) ||
       !(window_pos->flags & SWP_NOMOVE)) {
     RECT cr;
     GetClientRect(hwnd(), &cr);
     delegate_->OnBoundsChanged(
         gfx::Rect(window_pos->x, window_pos->y,
                   cr.right - cr.left, cr.bottom - cr.top));
   }
 }
 
-namespace test {
-
-// static
-void SetUsePopupAsRootWindowForTest(bool use) {
-  use_popup_as_root_window_for_test = use;
-}
-
-}  // namespace test
 }  // namespace ui