diff options
author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 16:47:33 +0000 |
---|---|---|
committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 16:47:33 +0000 |
commit | 85bd656d3817628cfccb1f0883c1d25dcf644140 (patch) | |
tree | b883273d0b351f4c9e9da465cd7dcecb7bd09b1a /chrome/browser/android/tab_android.h | |
parent | eb2d2abc0efb866baaf15c254713758f04c71b08 (diff) | |
download | chromium_src-85bd656d3817628cfccb1f0883c1d25dcf644140.zip chromium_src-85bd656d3817628cfccb1f0883c1d25dcf644140.tar.gz chromium_src-85bd656d3817628cfccb1f0883c1d25dcf644140.tar.bz2 |
[Android] Move LoadUrl from Tab upstream.
BUG=350016
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/177013006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/android/tab_android.h')
-rw-r--r-- | chrome/browser/android/tab_android.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h index 821c14c..db02c30 100644 --- a/chrome/browser/android/tab_android.h +++ b/chrome/browser/android/tab_android.h @@ -37,9 +37,19 @@ class ContentViewCore; class WebContents; } +namespace prerender { +class PrerenderManager; +} + class TabAndroid : public CoreTabHelperDelegate, public content::NotificationObserver { public: + enum TabLoadStatus { +#define DEFINE_TAB_LOAD_STATUS(name, value) name = value, +#include "chrome/browser/android/tab_load_status.h" +#undef DEFINE_TAB_LOAD_STATUS + }; + // Convenience method to retrieve the Tab associated with the passed // WebContents. Can return NULL. static TabAndroid* FromWebContents(content::WebContents* web_contents); @@ -107,8 +117,7 @@ class TabAndroid : public CoreTabHelperDelegate, // of service and the privacy notice. virtual bool ShouldWelcomePageLinkToTermsOfService(); - // Register the Tab's native methods through JNI. - static bool RegisterTabAndroid(JNIEnv* env); + bool HasPrerenderedUrl(GURL gurl); // CoreTabHelperDelegate ---------------------------------------------------- @@ -138,6 +147,14 @@ class TabAndroid : public CoreTabHelperDelegate, jobject obj); base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env, jobject obj); + virtual TabLoadStatus LoadUrl(JNIEnv* env, + jobject obj, + jstring url, + jstring j_extra_headers, + jbyteArray j_post_data, + jint page_transition, + jstring j_referrer_url, + jint referrer_policy); ToolbarModel::SecurityLevel GetSecurityLevel(JNIEnv* env, jobject obj); void SetActiveNavigationEntryTitleForUrl(JNIEnv* env, jobject obj, @@ -145,7 +162,12 @@ class TabAndroid : public CoreTabHelperDelegate, jstring jtitle); bool Print(JNIEnv* env, jobject obj); + // Register the Tab's native methods through JNI. + static bool RegisterTabAndroid(JNIEnv* env); + private: + prerender::PrerenderManager* GetPrerenderManager() const; + JavaObjectWeakGlobalRef weak_java_tab_; // The identifier used by session restore for this tab. |