Set the WindowId of the SessionTabHelper

chrome/browser/android/tab_android.cc

Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 0f60a6f6fd7384a8b73a3266a3620cac7ca312c6..a12591c2a5e73e450945c62384bfeee1c9aa1f06 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -21,6 +21,8 @@
 #include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/alternate_error_tab_observer.h"
+#include "chrome/browser/ui/android/tab_model/tab_model.h"
+#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
@@ -185,6 +187,17 @@ void TabAndroid::InitWebContents(JNIEnv* env,
   web_contents_delegate_->LoadProgressChanged(web_contents(), 0);
   web_contents()->SetDelegate(web_contents_delegate_.get());
 
+  // Set the window ID if we have a valid TabModel.

[nyquist, 2013/08/30 01:06:21]

Nit: Try to avoid using pronouns.

+  TabModel* model = TabModelList::GetTabModelWithProfile(GetProfile());
+  if (model) {
+    SessionID window_id;
+    window_id.set_id(model->GetSessionId());
+
+    SessionTabHelper* session_tab_helper =
+        SessionTabHelper::FromWebContents(web_contents());
+    session_tab_helper->SetWindowID(window_id);
+  }
+
   // Verify that the WebContents this tab represents matches the expected
   // off the record state.
   CHECK_EQ(GetProfile()->IsOffTheRecord(), incognito);