Re-land:

chrome/browser/ui/views/tab_contents/tab_contents_view_views.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_VIEWS_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "views/widget/widget.h"
 
 class NativeTabContentsView;
 class RenderViewContextMenuViews;
 class SadTabView;
 class SkBitmap;
 struct WebDropData;
 namespace gfx {
 class Point;
 class Size;
 }
 namespace views {
 class Widget;
 }
 
 // Views-specific implementation of the TabContentsView.
 // TODO(beng): Remove last remnants of Windows-specificity, and make this
 //             subclass Widget.
-class TabContentsViewViews : public TabContentsView,
+class TabContentsViewViews : public views::Widget,
+                             public TabContentsView,
                              public internal::NativeTabContentsViewDelegate {
  public:
   // The corresponding TabContents is passed in the constructor, and manages our
   // lifetime. This doesn't need to be the case, but is this way currently
   // because that's what was easiest when they were split.
   explicit TabContentsViewViews(TabContents* tab_contents);
   virtual ~TabContentsViewViews();
 
   // Reset the native parent of this view to NULL.  Unparented windows should
   // not receive any messages.
   virtual void Unparent();
 
+  NativeTabContentsView* native_tab_contents_view() const {
+    return native_tab_contents_view_;
+  }
+
   // Overridden from TabContentsView:
   virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
   virtual RenderWidgetHostView* CreateViewForWidget(
       RenderWidgetHost* render_widget_host) OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
   virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
   virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
   virtual void SetPageTitle(const std::wstring& title) OVERRIDE;
   virtual void OnTabCrashed(base::TerminationStatus status,
@@ skipping 21 matching lines @@
   virtual void GotFocus() OVERRIDE;
   virtual void TakeFocus(bool reverse) OVERRIDE;
 
  private:
   // Overridden from internal::NativeTabContentsViewDelegate:
   virtual TabContents* GetTabContents() OVERRIDE;
   virtual bool IsShowingSadTab() const OVERRIDE;
   virtual void OnNativeTabContentsViewShown() OVERRIDE;
   virtual void OnNativeTabContentsViewHidden() OVERRIDE;
   virtual void OnNativeTabContentsViewSized(const gfx::Size& size) OVERRIDE;
-  virtual void OnNativeTabContentsViewWheelZoom(int distance) OVERRIDE;
+  virtual void OnNativeTabContentsViewWheelZoom(bool zoom_in) OVERRIDE;
   virtual void OnNativeTabContentsViewMouseDown() OVERRIDE;
-  virtual void OnNativeTabContentsViewMouseMove() OVERRIDE;
+  virtual void OnNativeTabContentsViewMouseMove(bool motion) OVERRIDE;
   virtual void OnNativeTabContentsViewDraggingEnded() OVERRIDE;
+  virtual views::internal::NativeWidgetDelegate* AsNativeWidgetDelegate()
+      OVERRIDE;
 
-  views::Widget* GetWidget();
-  const views::Widget* GetWidget() const;
+  // Overridden from views::Widget:
+  virtual views::FocusManager* GetFocusManager() OVERRIDE;
 
   // A helper method for closing the tab.
   void CloseTab();
 
   // Windows events ------------------------------------------------------------
 
   // Handles notifying the TabContents and other operations when the window was
   // shown or hidden.
   void WasHidden();
   void WasShown();
 
   // Handles resizing of the contents. This will notify the RenderWidgetHostView
   // of the change, reposition popups, and the find in page bar.
   void WasSized(const gfx::Size& size);
 
   // TODO(brettw) comment these. They're confusing.
   void WheelZoom(int distance);
 
   // ---------------------------------------------------------------------------
 
-  scoped_ptr<NativeTabContentsView> native_tab_contents_view_;
+  NativeTabContentsView* native_tab_contents_view_;
 
   // Used to render the sad tab. This will be non-NULL only when the sad tab is
   // visible.
   SadTabView* sad_tab_;
 
   // The id used in the ViewStorage to store the last focused view.
   int last_focused_view_storage_id_;
 
   // The context menu. Callbacks are asynchronous so we need to keep it around.
   scoped_ptr<RenderViewContextMenuViews> context_menu_;
 
   // Set to true if we want to close the tab after the system drag operation
   // has finished.
   bool close_tab_after_drag_ends_;
 
   // Used to close the tab after the stack has unwound.
   base::OneShotTimer<TabContentsViewViews> close_tab_timer_;
 
+  // The FocusManager associated with this tab.  Stored as it is not directly
+  // accessible when un-parented.
+  views::FocusManager* focus_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_VIEWS_H_