| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 void SetSyncId(int sync_id); | 110 void SetSyncId(int sync_id); |
| 111 | 111 |
| 112 void HandlePopupNavigation(chrome::NavigateParams* params); | 112 void HandlePopupNavigation(chrome::NavigateParams* params); |
| 113 | 113 |
| 114 bool HasPrerenderedUrl(GURL gurl); | 114 bool HasPrerenderedUrl(GURL gurl); |
| 115 | 115 |
| 116 void MakeLoadURLParams( | 116 void MakeLoadURLParams( |
| 117 chrome::NavigateParams* params, | 117 chrome::NavigateParams* params, |
| 118 content::NavigationController::LoadURLParams* load_url_params); | 118 content::NavigationController::LoadURLParams* load_url_params); |
| 119 | 119 |
| 120 SkBitmap GetFaviconBitmap(); | |
| 121 | |
| 122 // CoreTabHelperDelegate ---------------------------------------------------- | 120 // CoreTabHelperDelegate ---------------------------------------------------- |
| 123 | 121 |
| 124 void SwapTabContents(content::WebContents* old_contents, | 122 void SwapTabContents(content::WebContents* old_contents, |
| 125 content::WebContents* new_contents, | 123 content::WebContents* new_contents, |
| 126 bool did_start_load, | 124 bool did_start_load, |
| 127 bool did_finish_load) override; | 125 bool did_finish_load) override; |
| 128 | 126 |
| 129 // Overridden from InstantServiceObserver: | 127 // Overridden from InstantServiceObserver: |
| 130 void DefaultSearchProviderChanged( | 128 void DefaultSearchProviderChanged( |
| 131 bool google_base_url_domain_changed) override; | 129 bool google_base_url_domain_changed) override; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 scoped_ptr<content::WebContents> web_contents_; | 235 scoped_ptr<content::WebContents> web_contents_; |
| 238 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> | 236 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> |
| 239 web_contents_delegate_; | 237 web_contents_delegate_; |
| 240 | 238 |
| 241 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; | 239 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; |
| 242 | 240 |
| 243 DISALLOW_COPY_AND_ASSIGN(TabAndroid); | 241 DISALLOW_COPY_AND_ASSIGN(TabAndroid); |
| 244 }; | 242 }; |
| 245 | 243 |
| 246 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ | 244 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ |
| OLD | NEW |