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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 // Overridden from SearchTabHelperDelegate: | 139 // Overridden from SearchTabHelperDelegate: |
140 void OnWebContentsInstantSupportDisabled( | 140 void OnWebContentsInstantSupportDisabled( |
141 const content::WebContents* web_contents) override; | 141 const content::WebContents* web_contents) override; |
142 | 142 |
143 // Overridden from NotificationObserver: | 143 // Overridden from NotificationObserver: |
144 void Observe(int type, | 144 void Observe(int type, |
145 const content::NotificationSource& source, | 145 const content::NotificationSource& source, |
146 const content::NotificationDetails& details) override; | 146 const content::NotificationDetails& details) override; |
147 | 147 |
148 // Overridden from favicon::FaviconDriverObserver: | 148 // Overridden from favicon::FaviconDriverObserver: |
149 void OnFaviconAvailable(const gfx::Image& image) override; | |
150 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, | 149 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, |
151 bool icon_url_changed) override; | 150 NotificationIconType notification_icon_type, |
| 151 const GURL& icon_url, |
| 152 bool icon_url_changed, |
| 153 const gfx::Image& image) override; |
152 | 154 |
153 // Methods called from Java via JNI ----------------------------------------- | 155 // Methods called from Java via JNI ----------------------------------------- |
154 | 156 |
155 void Destroy(JNIEnv* env, jobject obj); | 157 void Destroy(JNIEnv* env, jobject obj); |
156 void InitWebContents(JNIEnv* env, | 158 void InitWebContents(JNIEnv* env, |
157 jobject obj, | 159 jobject obj, |
158 jboolean incognito, | 160 jboolean incognito, |
159 jobject jcontent_view_core, | 161 jobject jcontent_view_core, |
160 jobject jweb_contents_delegate, | 162 jobject jweb_contents_delegate, |
161 jobject jcontext_menu_populator); | 163 jobject jcontext_menu_populator); |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 scoped_ptr<content::WebContents> web_contents_; | 257 scoped_ptr<content::WebContents> web_contents_; |
256 scoped_ptr<chrome::android::TabWebContentsDelegateAndroid> | 258 scoped_ptr<chrome::android::TabWebContentsDelegateAndroid> |
257 web_contents_delegate_; | 259 web_contents_delegate_; |
258 | 260 |
259 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; | 261 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; |
260 | 262 |
261 DISALLOW_COPY_AND_ASSIGN(TabAndroid); | 263 DISALLOW_COPY_AND_ASSIGN(TabAndroid); |
262 }; | 264 }; |
263 | 265 |
264 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ | 266 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ |
OLD | NEW |