Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

content/browser/renderer_host/render_widget_host_view_android.h

 // 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/process.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "ui/gfx/size.h"
 
 struct ViewHostMsg_TextInputState_Params;
 
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 
 namespace content {
-class ContentViewImpl;
+class ContentViewCoreImpl;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct NativeWebKeyboardEvent;
 
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
 // -----------------------------------------------------------------------------
 class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
-                              ContentViewImpl* content_view);
+                              ContentViewCoreImpl* content_view_core);
   virtual ~RenderWidgetHostViewAndroid();
 
   // RenderWidgetHostView implementation.
   virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
                            const gfx::Rect& pos) OVERRIDE;
   virtual void InitAsFullscreen(
       RenderWidgetHostView* reference_host_view) OVERRIDE;
   virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
   virtual void WasRestored() OVERRIDE;
@@ skipping 54 matching lines @@
                                bool processed) OVERRIDE;
   virtual void SetHasHorizontalScrollbar(
       bool has_horizontal_scrollbar) OVERRIDE;
   virtual void SetScrollOffsetPinning(
       bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
   virtual bool LockMouse() OVERRIDE;
   virtual void UnlockMouse() OVERRIDE;
 
   virtual void StartContentIntent(const GURL& content_url) OVERRIDE;
 
-  void SetContentView(ContentViewImpl* content_view);
+  void SetContentViewCore(ContentViewCoreImpl* content_view_core);
 
  private:
   // The model object.
   RenderWidgetHostImpl* host_;
 
   // Whether or not this widget is hidden.
   bool is_hidden_;
 
-  // ContentViewImpl is our interface to the view system.
-  ContentViewImpl* content_view_;
+  // ContentViewCoreImpl is our interface to the view system.
+  ContentViewCoreImpl* content_view_core_;
 
   // The size that we want the renderer to be.  We keep this in a separate
   // variable because resizing is async.
   gfx::Size requested_size_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_