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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 | 184 |
185 static void CreateHistoricalTabFromContents( | 185 static void CreateHistoricalTabFromContents( |
186 content::WebContents* web_contents); | 186 content::WebContents* web_contents); |
187 | 187 |
188 void UpdateTopControlsState(JNIEnv* env, | 188 void UpdateTopControlsState(JNIEnv* env, |
189 jobject obj, | 189 jobject obj, |
190 jint constraints, | 190 jint constraints, |
191 jint current, | 191 jint current, |
192 jboolean animate); | 192 jboolean animate); |
193 | 193 |
| 194 void ShowOriginalImage(JNIEnv* env, jobject obj); |
| 195 |
194 void SearchByImageInNewTabAsync(JNIEnv* env, jobject obj); | 196 void SearchByImageInNewTabAsync(JNIEnv* env, jobject obj); |
195 | 197 |
196 jlong GetBookmarkId(JNIEnv* env, jobject obj, jboolean only_editable); | 198 jlong GetBookmarkId(JNIEnv* env, jobject obj, jboolean only_editable); |
197 | 199 |
198 void SetInterceptNavigationDelegate(JNIEnv* env, | 200 void SetInterceptNavigationDelegate(JNIEnv* env, |
199 jobject obj, | 201 jobject obj, |
200 jobject delegate); | 202 jobject delegate); |
201 | 203 |
202 // TODO(dtrainor): Remove this, pull content_layer() on demand. | 204 // TODO(dtrainor): Remove this, pull content_layer() on demand. |
203 void AttachToTabContentManager(JNIEnv* env, | 205 void AttachToTabContentManager(JNIEnv* env, |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 scoped_ptr<content::WebContents> web_contents_; | 239 scoped_ptr<content::WebContents> web_contents_; |
238 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> | 240 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> |
239 web_contents_delegate_; | 241 web_contents_delegate_; |
240 | 242 |
241 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; | 243 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; |
242 | 244 |
243 DISALLOW_COPY_AND_ASSIGN(TabAndroid); | 245 DISALLOW_COPY_AND_ASSIGN(TabAndroid); |
244 }; | 246 }; |
245 | 247 |
246 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ | 248 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ |
OLD | NEW |