Merge 273865 "Use LoadURLWithParams in ChromeWebContentsDelegate..."

chrome/browser/android/tab_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 CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
@@ skipping 121 matching lines @@
                                                             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);
+                                jint referrer_policy,
+                                jboolean is_renderer_initiated);
   ToolbarModel::SecurityLevel GetSecurityLevel(JNIEnv* env, jobject obj);
   void SetActiveNavigationEntryTitleForUrl(JNIEnv* env,
                                            jobject obj,
                                            jstring jurl,
                                            jstring jtitle);
   bool Print(JNIEnv* env, jobject obj);
 
   // Register the Tab's native methods through JNI.
   static bool RegisterTabAndroid(JNIEnv* env);
 
@@ skipping 13 matching lines @@
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
       web_contents_delegate_;
 
   scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_