Upstream JavaBridge tests.

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_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_helper.h"
@@ skipping 25 matching lines @@
 class ContentViewCoreImpl : public ContentViewCore,
                             public NotificationObserver {
  public:
   ContentViewCoreImpl(JNIEnv* env,
                       jobject obj,
                       bool hardware_accelerated,
                       bool take_ownership_of_web_contents,
                       WebContents* web_contents,
                       ui::WindowAndroid* window_android);
 
+  // Called from UI thread
+  void Invalidate();
+  void DetachWebContents(WebContents* web_contents);
+
+  // Called from non-UI thread
+  void PostInvalidate();
+
+
   // ContentViewCore overrides
   virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE;
 
+  virtual content::WebContents* AcquireWebContents() OVERRIDE;
+  virtual void ReplaceWebContents(
+      content::WebContents* old_web_contents,
+      content::WebContents* new_web_contents) OVERRIDE;
+
+  // Called when page loading begins.

[Yaron, 2012/09/20 04:13:53]

Most of this is being refactored by Yusuf:
https://gerrit-int.chromium.org/#/c/25017/

+  virtual void DidStartLoading() OVERRIDE;
+
+  virtual void OnPageStarted(const GURL& validated_url) OVERRIDE;
+  virtual void OnPageFinished(const GURL& validated_url) OVERRIDE;
+  virtual void OnPageFailed(int error_code, const string16& description,
+                            const GURL& failingUrl) OVERRIDE;
+  virtual void OnDidCommitMainFrame(const GURL& url,
+                                    const GURL& base_url) OVERRIDE;
+  void StartContentIntent(const GURL& content_url);
+
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   // Notifies the ContentViewCore that items were selected in the currently
   // showing select popup.
   void SelectPopupMenuItems(JNIEnv* env, jobject obj, jintArray indices);
 
   void LoadUrl(
       JNIEnv* env, jobject obj,
@@ skipping 98 matching lines @@
   void ConfirmTouchEvent(bool handled);
   void DidSetNeedTouchEvents(bool need_touch_events);
   void OnSelectionChanged(const std::string& text);
   void OnSelectionBoundsChanged(int startx,
                                 int starty,
                                 base::i18n::TextDirection start_dir,
                                 int endx,
                                 int endy,
                                 base::i18n::TextDirection end_dir);
 
-  // Called when page loading begins.
-  void DidStartLoading();
-  void StartContentIntent(const GURL& content_url);
-
   // --------------------------------------------------------------------------
   // Methods called from native code
   // --------------------------------------------------------------------------
 
   gfx::Rect GetBounds() const;
 
   WebContents* web_contents() const { return web_contents_; }
 
   virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
   virtual ui::WindowAndroid* GetWindowAndroid() OVERRIDE;
@@ skipping 25 matching lines @@
                         int x, int y);
 
   struct JavaObject;
   JavaObject* java_object_;
 
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;
 
   NotificationRegistrar notification_registrar_;
 
+  class ContentViewWebContentsObserver;
+  scoped_ptr<ContentViewWebContentsObserver> web_contents_observer_;
+
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;
   bool owns_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 ContentViewCore has crashed.
   bool tab_crashed_;
 
   // The owning window that has a hold of main application activity.
   ui::WindowAndroid* window_android_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_