Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: chrome/browser/android/tab_android.h

Issue 496733005: Some favicon cleanup/upstreaming (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 ToolbarModel::SecurityLevel GetSecurityLevel(JNIEnv* env, jobject obj); 144 ToolbarModel::SecurityLevel GetSecurityLevel(JNIEnv* env, jobject obj);
145 void SetActiveNavigationEntryTitleForUrl(JNIEnv* env, 145 void SetActiveNavigationEntryTitleForUrl(JNIEnv* env,
146 jobject obj, 146 jobject obj,
147 jstring jurl, 147 jstring jurl,
148 jstring jtitle); 148 jstring jtitle);
149 bool Print(JNIEnv* env, jobject obj); 149 bool Print(JNIEnv* env, jobject obj);
150 // Called to get favicon of current tab, return null if no favicon is 150 // Called to get favicon of current tab, return null if no favicon is
151 // avaliable for current tab. 151 // avaliable for current tab.
152 base::android::ScopedJavaLocalRef<jobject> GetFavicon(JNIEnv* env, 152 base::android::ScopedJavaLocalRef<jobject> GetFavicon(JNIEnv* env,
153 jobject obj); 153 jobject obj);
154 jboolean IsFaviconValid(JNIEnv* env, jobject jobj);
154 155
155 // Register the Tab's native methods through JNI. 156 // Register the Tab's native methods through JNI.
156 static bool RegisterTabAndroid(JNIEnv* env); 157 static bool RegisterTabAndroid(JNIEnv* env);
157 158
158 private: 159 private:
159 prerender::PrerenderManager* GetPrerenderManager() const; 160 prerender::PrerenderManager* GetPrerenderManager() const;
160 161
161 JavaObjectWeakGlobalRef weak_java_tab_; 162 JavaObjectWeakGlobalRef weak_java_tab_;
162 163
163 // The identifier used by session restore for this tab. 164 // The identifier used by session restore for this tab.
164 SessionID session_tab_id_; 165 SessionID session_tab_id_;
165 166
166 // Identifier of the window the tab is in. 167 // Identifier of the window the tab is in.
167 SessionID session_window_id_; 168 SessionID session_window_id_;
168 169
169 content::NotificationRegistrar notification_registrar_; 170 content::NotificationRegistrar notification_registrar_;
170 171
171 scoped_ptr<content::WebContents> web_contents_; 172 scoped_ptr<content::WebContents> web_contents_;
172 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 173 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
173 web_contents_delegate_; 174 web_contents_delegate_;
174 175
175 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 176 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
176 177
177 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 178 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
178 }; 179 };
179 180
180 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 181 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698