[Sync] Fix Session's handling of windows.

chrome/browser/ui/webui/sessions_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/sessions_ui.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
@@ skipping 60 matching lines @@
   // Sends the recent session list to JS.
   void UpdateUI();
 
   // Returns the model associated for getting the list of sessions from sync.
   browser_sync::SessionModelAssociator* GetModelAssociator();
 
   // Appends each entry in |tabs| to |tab_list| as a DictonaryValue.
   void GetTabList(const std::vector<SessionTab*>& tabs, ListValue* tab_list);
 
   // Appends each entry in |windows| to |window_list| as a DictonaryValue.
-  void GetWindowList(const std::vector<SessionWindow*>& windows,
-                     ListValue* window_list);
+  void GetWindowList(
+      const browser_sync::SyncedSession::SyncedWindowMap& windows,
+      ListValue* window_list);
 
   // Appends each entry in |sessions| to |session_list| as a DictonaryValue.
   void GetSessionList(
       const std::vector<const browser_sync::SyncedSession*>& sessions,
       ListValue* session_list);
 
   // Traverses all tabs in |sessions| and adds them to |all_tabs|.
   void GetAllTabs(
       const std::vector<const browser_sync::SyncedSession*>& sessions,
       std::vector<SessionTab*>* all_tabs);
@@ skipping 56 matching lines @@
     if (nav.title().empty())
       tab_data->SetString("title", nav.virtual_url().spec());
     else
       tab_data->SetString("title", nav.title());
     tab_data->SetString("url", nav.virtual_url().spec());
     tab_list->Append(tab_data.release());
   }
 }
 
 void SessionsDOMHandler::GetWindowList(
-    const std::vector<SessionWindow*>& windows, ListValue* window_list) {
-  for (std::vector<SessionWindow*>::const_iterator it =
+    const browser_sync::SyncedSession::SyncedWindowMap& windows,
+    ListValue* window_list) {
+  for (browser_sync::SyncedSession::SyncedWindowMap::const_iterator it =
       windows.begin(); it != windows.end(); ++it) {
-    const SessionWindow* window = *it;
+    const SessionWindow* window = it->second;
     scoped_ptr<DictionaryValue> window_data(new DictionaryValue());
     window_data->SetInteger("id", window->window_id.id());
     window_data->SetDouble("timestamp",
         static_cast<double> (window->timestamp.ToInternalValue()));
     scoped_ptr<ListValue> tab_list(new ListValue());
     GetTabList(window->tabs, tab_list.get());
     window_data->Set("tabs", tab_list.release());
     window_list->Append(window_data.release());
   }
 }
@@ skipping 10 matching lines @@
     GetWindowList(session->windows, window_list.get());
     session_data->Set("windows", window_list.release());
     session_list->Append(session_data.release());
   }
 }
 
 void SessionsDOMHandler::GetAllTabs(
     const std::vector<const browser_sync::SyncedSession*>& sessions,
     std::vector<SessionTab*>* all_tabs) {
   for (size_t i = 0; i < sessions.size(); i++) {
-    const std::vector<SessionWindow*>& windows = sessions[i]->windows;
-    for (size_t j = 0; j < windows.size(); j++) {
-      const std::vector<SessionTab*>& tabs = windows[j]->tabs;
+    const browser_sync::SyncedSession::SyncedWindowMap& windows =
+        sessions[i]->windows;
+    browser_sync::SyncedSession::SyncedWindowMap::const_iterator iter =

[akalin, 2011/09/26 21:57:24]

prefer for loop (even though the indentation gets awkward)

[Nicolas Zea, 2011/09/26 22:55:26]

Done.

+        windows.begin();
+    while (iter != windows.end()) {
+      const std::vector<SessionTab*>& tabs = iter->second->tabs;
       all_tabs->insert(all_tabs->end(), tabs.begin(), tabs.end());
+      ++iter;
     }
   }
 }
 
 // Comparator function for sort() in CreateMagicTabList() below.
 bool CompareTabsByTimestamp(SessionTab* lhs, SessionTab* rhs) {
   return lhs->timestamp.ToInternalValue() > rhs->timestamp.ToInternalValue();
 }
 
 void SessionsDOMHandler::CreateMagicTabList(
@@ skipping 49 matching lines @@
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateSessionsUIHTMLSource());
 }
 
 // static
 RefCountedMemory* SessionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }