OLD | NEW |
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 content::WebContents* web_contents); | 183 content::WebContents* web_contents); |
184 | 184 |
185 void UpdateTopControlsState(JNIEnv* env, | 185 void UpdateTopControlsState(JNIEnv* env, |
186 jobject obj, | 186 jobject obj, |
187 jint constraints, | 187 jint constraints, |
188 jint current, | 188 jint current, |
189 jboolean animate); | 189 jboolean animate); |
190 | 190 |
191 void SearchByImageInNewTabAsync(JNIEnv* env, jobject obj); | 191 void SearchByImageInNewTabAsync(JNIEnv* env, jobject obj); |
192 | 192 |
| 193 jlong GetBookmarkId(JNIEnv* env, jobject obj, jboolean only_editable); |
| 194 |
193 void SetInterceptNavigationDelegate(JNIEnv* env, | 195 void SetInterceptNavigationDelegate(JNIEnv* env, |
194 jobject obj, | 196 jobject obj, |
195 jobject delegate); | 197 jobject delegate); |
196 | 198 |
197 // TODO(dtrainor): Remove this, pull content_layer() on demand. | 199 // TODO(dtrainor): Remove this, pull content_layer() on demand. |
198 void AttachToTabContentManager(JNIEnv* env, | 200 void AttachToTabContentManager(JNIEnv* env, |
199 jobject obj, | 201 jobject obj, |
200 jobject jtab_content_manager); | 202 jobject jtab_content_manager); |
201 | 203 |
202 void AttachOverlayContentViewCore(JNIEnv* env, | 204 void AttachOverlayContentViewCore(JNIEnv* env, |
(...skipping 27 matching lines...) Expand all Loading... |
230 scoped_ptr<content::WebContents> web_contents_; | 232 scoped_ptr<content::WebContents> web_contents_; |
231 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> | 233 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> |
232 web_contents_delegate_; | 234 web_contents_delegate_; |
233 | 235 |
234 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; | 236 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; |
235 | 237 |
236 DISALLOW_COPY_AND_ASSIGN(TabAndroid); | 238 DISALLOW_COPY_AND_ASSIGN(TabAndroid); |
237 }; | 239 }; |
238 | 240 |
239 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ | 241 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ |
OLD | NEW |