Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: chrome/browser/android/tab_android.h

Issue 571813003: Fix Tab.getWebContents for downstream instrumentation tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove native method Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 virtual void Destroy(JNIEnv* env, jobject obj); 127 virtual void Destroy(JNIEnv* env, jobject obj);
128 virtual void InitWebContents(JNIEnv* env, 128 virtual void InitWebContents(JNIEnv* env,
129 jobject obj, 129 jobject obj,
130 jboolean incognito, 130 jboolean incognito,
131 jobject jcontent_view_core, 131 jobject jcontent_view_core,
132 jobject jweb_contents_delegate, 132 jobject jweb_contents_delegate,
133 jobject jcontext_menu_populator); 133 jobject jcontext_menu_populator);
134 virtual void DestroyWebContents(JNIEnv* env, 134 virtual void DestroyWebContents(JNIEnv* env,
135 jobject obj, 135 jobject obj,
136 jboolean delete_native); 136 jboolean delete_native);
137 base::android::ScopedJavaLocalRef<jobject> GetWebContents(JNIEnv* env,
138 jobject obj);
139 base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env, 137 base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env,
140 jobject obj); 138 jobject obj);
141 virtual TabLoadStatus LoadUrl(JNIEnv* env, 139 virtual TabLoadStatus LoadUrl(JNIEnv* env,
142 jobject obj, 140 jobject obj,
143 jstring url, 141 jstring url,
144 jstring j_extra_headers, 142 jstring j_extra_headers,
145 jbyteArray j_post_data, 143 jbyteArray j_post_data,
146 jint page_transition, 144 jint page_transition,
147 jstring j_referrer_url, 145 jstring j_referrer_url,
148 jint referrer_policy, 146 jint referrer_policy,
(...skipping 29 matching lines...) Expand all
178 scoped_ptr<content::WebContents> web_contents_; 176 scoped_ptr<content::WebContents> web_contents_;
179 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 177 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
180 web_contents_delegate_; 178 web_contents_delegate_;
181 179
182 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 180 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
183 181
184 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 182 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
185 }; 183 };
186 184
187 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 185 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/Tab.java ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698