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