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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 void OnWebContentsInstantSupportDisabled( | 132 void OnWebContentsInstantSupportDisabled( |
133 const content::WebContents* web_contents) override; | 133 const content::WebContents* web_contents) override; |
134 | 134 |
135 // NotificationObserver ----------------------------------------------------- | 135 // NotificationObserver ----------------------------------------------------- |
136 void Observe(int type, | 136 void Observe(int type, |
137 const content::NotificationSource& source, | 137 const content::NotificationSource& source, |
138 const content::NotificationDetails& details) override; | 138 const content::NotificationDetails& details) override; |
139 | 139 |
140 // favicon::FaviconDriverObserver ------------------------------------------- | 140 // favicon::FaviconDriverObserver ------------------------------------------- |
141 void OnFaviconAvailable(const gfx::Image& image) override; | 141 void OnFaviconAvailable(const gfx::Image& image) override; |
| 142 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, |
| 143 bool icon_url_changed) override; |
142 | 144 |
143 // Methods called from Java via JNI ----------------------------------------- | 145 // Methods called from Java via JNI ----------------------------------------- |
144 | 146 |
145 void Destroy(JNIEnv* env, jobject obj); | 147 void Destroy(JNIEnv* env, jobject obj); |
146 void InitWebContents(JNIEnv* env, | 148 void InitWebContents(JNIEnv* env, |
147 jobject obj, | 149 jobject obj, |
148 jboolean incognito, | 150 jboolean incognito, |
149 jobject jcontent_view_core, | 151 jobject jcontent_view_core, |
150 jobject jweb_contents_delegate, | 152 jobject jweb_contents_delegate, |
151 jobject jcontext_menu_populator); | 153 jobject jcontext_menu_populator); |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 scoped_ptr<content::WebContents> web_contents_; | 235 scoped_ptr<content::WebContents> web_contents_; |
234 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> | 236 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> |
235 web_contents_delegate_; | 237 web_contents_delegate_; |
236 | 238 |
237 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; | 239 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; |
238 | 240 |
239 DISALLOW_COPY_AND_ASSIGN(TabAndroid); | 241 DISALLOW_COPY_AND_ASSIGN(TabAndroid); |
240 }; | 242 }; |
241 | 243 |
242 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ | 244 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ |
OLD | NEW |