Index: chrome/browser/android/tab_android.h |
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h |
index 46edfc58cf83dfc4220c184d337ae07325978dc5..746212196dcaf7c075ae9ecf6e277f176b465f46 100644 |
--- a/chrome/browser/android/tab_android.h |
+++ b/chrome/browser/android/tab_android.h |
@@ -10,6 +10,7 @@ |
#include "base/android/jni_helper.h" |
#include "base/callback_forward.h" |
#include "base/string16.h" |
+#include "chrome/browser/sessions/session_id.h" |
#include "chrome/browser/ui/toolbar/toolbar_model.h" |
class GURL; |
@@ -41,9 +42,7 @@ class TabAndroid { |
virtual ToolbarModel::SecurityLevel GetSecurityLevel(); |
- int id() const { |
- return tab_id_; |
- } |
+ const SessionID& id() const { return tab_id_; } |
virtual void OnReceivedHttpAuthRequest(jobject auth_handler, |
const string16& host, |
@@ -78,10 +77,9 @@ class TabAndroid { |
static void InitTabHelpers(content::WebContents* web_contents); |
- static content::WebContents* InitWebContentsFromView(JNIEnv* env, |
- jobject content_view); |
- |
- int tab_id_; |
+ content::WebContents* InitWebContentsFromView(JNIEnv* env, |
+ jobject content_view); |
Nicolas Zea
2013/05/22 20:36:37
nit: newline after
shashi
2013/05/22 21:18:59
Done.
|
+ SessionID tab_id_; |
private: |
JavaObjectWeakGlobalRef weak_java_tab_; |