| 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_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ | 5 #ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ |
| 6 #define CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ | 6 #define CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 content::WebContents* web_contents, | 36 content::WebContents* web_contents, |
| 37 ui::WindowAndroid* window_android); | 37 ui::WindowAndroid* window_android); |
| 38 void Destroy(JNIEnv* env, jobject obj); | 38 void Destroy(JNIEnv* env, jobject obj); |
| 39 | 39 |
| 40 // -------------------------------------------------------------------------- | 40 // -------------------------------------------------------------------------- |
| 41 // TabAndroid Methods | 41 // TabAndroid Methods |
| 42 // -------------------------------------------------------------------------- | 42 // -------------------------------------------------------------------------- |
| 43 virtual content::WebContents* GetWebContents() OVERRIDE; | 43 virtual content::WebContents* GetWebContents() OVERRIDE; |
| 44 | 44 |
| 45 virtual browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() OVERRIDE; | 45 virtual browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() OVERRIDE; |
| 46 virtual int64 GetSyncSessionId() OVERRIDE; |
| 47 virtual void SetSyncSessionId(int64 sync_id) OVERRIDE; |
| 46 | 48 |
| 47 virtual void OnReceivedHttpAuthRequest(jobject auth_handler, | 49 virtual void OnReceivedHttpAuthRequest(jobject auth_handler, |
| 48 const string16& host, | 50 const string16& host, |
| 49 const string16& realm) OVERRIDE; | 51 const string16& realm) OVERRIDE; |
| 50 virtual void ShowContextMenu( | 52 virtual void ShowContextMenu( |
| 51 const content::ContextMenuParams& params) OVERRIDE; | 53 const content::ContextMenuParams& params) OVERRIDE; |
| 52 | 54 |
| 53 virtual void ShowCustomContextMenu( | 55 virtual void ShowCustomContextMenu( |
| 54 const content::ContextMenuParams& params, | 56 const content::ContextMenuParams& params, |
| 55 const base::Callback<void(int)>& callback) OVERRIDE; | 57 const base::Callback<void(int)>& callback) OVERRIDE; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 83 | 85 |
| 84 private: | 86 private: |
| 85 scoped_ptr<content::WebContents> web_contents_; | 87 scoped_ptr<content::WebContents> web_contents_; |
| 86 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> | 88 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> |
| 87 web_contents_delegate_; | 89 web_contents_delegate_; |
| 88 | 90 |
| 89 DISALLOW_COPY_AND_ASSIGN(TestShellTab); | 91 DISALLOW_COPY_AND_ASSIGN(TestShellTab); |
| 90 }; | 92 }; |
| 91 | 93 |
| 92 #endif // CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ | 94 #endif // CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ |
| OLD | NEW |