Move RenderViewHostDelegateViewHelper to content.

chrome/browser/ui/views/tab_contents/tab_contents_view_views.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 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/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
-#include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/browser/tab_contents/tab_contents_view_helper.h"
 #include "ui/views/widget/widget.h"
 
 class ConstrainedWindowGtk;
 class NativeTabContentsView;
 class RenderViewContextMenuViews;
 class SkBitmap;
 struct WebDropData;
 namespace gfx {
 class Point;
 class Size;
@@ skipping 115 matching lines @@
   void WasSized(const gfx::Size& size);
 
   // TODO(brettw) comment these. They're confusing.
   void WheelZoom(int distance);
 
   // ---------------------------------------------------------------------------
 
   // The WebContents whose contents we display.
   content::WebContents* web_contents_;
 
-  // Common implementations of some RenderViewHostDelegate::View methods.
-  RenderViewHostDelegateViewHelper delegate_view_helper_;
+  // Common implementations of some TabContentsView methods.
+  TabContentsViewHelper tab_contents_view_helper_;
 
   NativeTabContentsView* native_tab_contents_view_;
 
   // 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.
   mutable const views::FocusManager* focus_manager_;
 
   // The overlaid view. Owned by the caller of |InstallOverlayView|; this is a
   // weak reference.
   views::Widget* overlaid_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_VIEWS_H_