Re-land:

chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc

 // Copyright (c) 2011 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/browser/ui/views/tab_contents/native_tab_contents_view_win.h"
 
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #include "chrome/browser/tab_contents/web_drop_target_win.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h"
@@ skipping 12 matching lines @@
 //
 // It may be tempting to use GetDesktopWindow() instead, but this is
 // problematic as the shell sends messages to children of the desktop
 // window that interact poorly with us.
 //
 // See: http://crbug.com/16476
 HWND GetHiddenTabHostWindow() {
   static views::Widget* widget = NULL;
 
   if (!widget) {
-    widget = views::Widget::CreateWidget();
+    widget = new views::Widget;
+    // We don't want this widget to be closed automatically, this causes
+    // problems in tests that close the last non-secondary window.
+    widget->set_is_secondary_widget(false);
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
     widget->Init(params);
     // If a background window requests focus, the hidden tab host will
     // be activated to focus the tab.  Use WS_DISABLED to prevent
     // this.
     EnableWindow(widget->GetNativeView(), FALSE);
   }
 
   return widget->GetNativeView();
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsViewWin, public:
 
 NativeTabContentsViewWin::NativeTabContentsViewWin(
     internal::NativeTabContentsViewDelegate* delegate)
-    : delegate_(delegate),
-      focus_manager_(NULL) {
+    : views::WidgetWin(delegate->AsNativeWidgetDelegate()),
+      delegate_(delegate) {
 }
 
 NativeTabContentsViewWin::~NativeTabContentsViewWin() {
   CloseNow();
 }
 
 TabContents* NativeTabContentsViewWin::GetTabContents() const {
   return delegate_->GetTabContents();
 }
 
 void NativeTabContentsViewWin::EndDragging() {
   delegate_->OnNativeTabContentsViewDraggingEnded();
   drag_handler_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsViewWin, NativeTabContentsView implementation:
 
 void NativeTabContentsViewWin::InitNativeTabContentsView() {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
+  params.native_widget = this;
   params.delete_on_destroy = false;
   params.parent = GetHiddenTabHostWindow();
   GetWidget()->Init(params);
 
   // Remove the root view drop target so we can register our own.
   RevokeDragDrop(GetNativeView());
   drop_target_ = new WebDropTarget(GetNativeView(),
                                    delegate_->GetTabContents());
 }
 
 void NativeTabContentsViewWin::Unparent() {
-  // Remember who our FocusManager is, we won't be able to access it once
-  // unparented.
-  focus_manager_ = views::WidgetWin::GetFocusManager();
   // Note that we do not DCHECK on focus_manager_ as it may be NULL when used
   // with an external tab container.
   NativeWidget::ReparentNativeView(GetNativeView(), GetHiddenTabHostWindow());
 }
 
 RenderWidgetHostView* NativeTabContentsViewWin::CreateRenderWidgetHostView(
     RenderWidgetHost* render_widget_host) {
   RenderWidgetHostViewWin* view =
       new RenderWidgetHostViewWin(render_widget_host);
   view->CreateWnd(GetNativeView());
@@ skipping 61 matching lines @@
     return WidgetWin::OnMouseRange(msg, w_param, l_param);
 
   switch (msg) {
     case WM_LBUTTONDOWN:
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN: {
       delegate_->OnNativeTabContentsViewMouseDown();
       break;
     }
     case WM_MOUSEMOVE:
-      delegate_->OnNativeTabContentsViewMouseMove();
+      delegate_->OnNativeTabContentsViewMouseMove(true);
       break;
     default:
       break;
   }
   return 0;
 }
 
 // A message is reflected here from view().
 // Return non-zero to indicate that it is handled here.
 // Return 0 to allow view() to further process it.
 LRESULT NativeTabContentsViewWin::OnReflectedMessage(UINT msg,
                                                      WPARAM w_param,
                                                      LPARAM l_param) {
   MSG* message = reinterpret_cast<MSG*>(l_param);
   switch (message->message) {
     case WM_MOUSEWHEEL:
       // This message is reflected from the view() to this window.
       if (GET_KEYSTATE_WPARAM(message->wParam) & MK_CONTROL) {
         delegate_->OnNativeTabContentsViewWheelZoom(
-            GET_WHEEL_DELTA_WPARAM(message->wParam));
+            GET_WHEEL_DELTA_WPARAM(message->wParam) > 0);
         return 1;
       }
       break;
     case WM_HSCROLL:
     case WM_VSCROLL:
       if (ScrollZoom(LOWORD(message->wParam)))
         return 1;
     default:
       break;
   }
@@ skipping 56 matching lines @@
   // to receive scroll messages from ThinkPad touch-pad driver. Suppress
   // painting of scrollbars by returning 0 size for them.
   return 0;
 }
 
 void NativeTabContentsViewWin::OnNCPaint(HRGN rgn) {
   // Suppress default WM_NCPAINT handling. We don't need to do anything
   // here since the view will draw everything correctly.
 }
 
-views::FocusManager* NativeTabContentsViewWin::GetFocusManager() {
-  views::FocusManager* focus_manager = WidgetWin::GetFocusManager();
-  if (focus_manager) {
-    // If focus_manager_ is non NULL, it means we have been reparented, in which
-    // case its value may not be valid anymore.
-    focus_manager_ = NULL;
-    return focus_manager;
-  }
-  // TODO(jcampan): we should DCHECK on focus_manager_, as it should not be
-  // NULL.  We are not doing it as it breaks some unit-tests.  We should
-  // probably have an empty TabContentView implementation for the unit-tests,
-  // that would prevent that code being executed in the unit-test case.
-  // DCHECK(focus_manager_);
-  return focus_manager_;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsViewWin, private:
 
 void NativeTabContentsViewWin::ScrollCommon(UINT message, int scroll_type,
                                             short position, HWND scrollbar) {
   // This window can receive scroll events as a result of the ThinkPad's
   // touch-pad scroll wheel emulation.
   if (!ScrollZoom(scroll_type)) {
     // Reflect scroll message to the view() to give it a chance
     // to process scrolling.
@@ skipping 21 matching lines @@
         break;
       case SB_LINEDOWN:
         distance = -WHEEL_DELTA;
         break;
         // TODO(joshia): Handle SB_PAGEUP, SB_PAGEDOWN, SB_THUMBPOSITION,
         // and SB_THUMBTRACK for completeness
       default:
         break;
     }
 
-    delegate_->OnNativeTabContentsViewWheelZoom(distance);
+    delegate_->OnNativeTabContentsViewWheelZoom(distance > 0);
     return true;
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsView, public:
 
 // static
 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView(
     internal::NativeTabContentsViewDelegate* delegate) {
   return new NativeTabContentsViewWin(delegate);
 }