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

content/browser/android/content_view_core_impl.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_ANDROID_CONTENT_VIEW_IMPL_H_
-#define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_
+#ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
+#define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include "base/android/jni_helper.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
-#include "content/public/browser/android/content_view.h"
+#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/notification_observer.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 namespace content {
 class ContentViewClient;
 class RenderWidgetHostViewAndroid;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
-class ContentViewImpl : public ContentView,
-                        public NotificationObserver {
+class ContentViewCoreImpl : public ContentViewCore,
+                            public NotificationObserver {
  public:
-  ContentViewImpl(JNIEnv* env,
-                  jobject obj,
-                  WebContents* web_contents);
+  ContentViewCoreImpl(JNIEnv* env,
+                      jobject obj,
+                      WebContents* web_contents);
   virtual void Destroy(JNIEnv* env, jobject obj);
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   void LoadUrlWithoutUrlSanitization(JNIEnv* env,
                                      jobject,
                                      jstring jurl,
                                      int page_transition);
@@ skipping 55 matching lines @@
 
  private:
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Private methods that call to Java via JNI
   // --------------------------------------------------------------------------
-  virtual ~ContentViewImpl();
+  virtual ~ContentViewCoreImpl();
 
   // --------------------------------------------------------------------------
   // Other private methods and data
   // --------------------------------------------------------------------------
 
   void InitJNI(JNIEnv* env, jobject obj);
 
   void PostLoadUrl(const GURL& url);
 
   struct JavaObject;
   JavaObject* java_object_;
 
   // Reference to the current WebContents used to determine how and what to
-  // display in the ContentView.
+  // display in the ContentViewCore.
   WebContents* web_contents_;
 
   // We only set this to be the delegate of the web_contents if we own it.
   scoped_ptr<ContentViewClient> content_view_client_;
 
-  // Whether the renderer backing this ContentView has crashed.
+  // Whether the renderer backing this ContentViewCore has crashed.
   bool tab_crashed_;
 
-  DISALLOW_COPY_AND_ASSIGN(ContentViewImpl);
+  DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
-bool RegisterContentView(JNIEnv* env);
+bool RegisterContentViewCore(JNIEnv* env);
 
 };  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_
+#endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_