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

Unified Diff: chrome/browser/sync/glue/session_model_associator.h

Issue 7966020: [Sync] Fix Session's handling of windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits, rebase. Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/session_restore.cc ('k') | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index de178dd9fa78c649d28835705ae3cf51bd160ec5..4aad133140cca658795f5fb7dcf66e64cb7d7d68 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -157,7 +157,7 @@ class SessionModelAssociator
// Loads all windows for foreign session with session tag |tag|.
// Caller does NOT own SyncedSession objects.
bool GetForeignSession(const std::string& tag,
- std::vector<SessionWindow*>* windows);
+ std::vector<const SessionWindow*>* windows);
// Looks up the foreign tab identified by |tab_id| and belonging to foreign
// session |tag|.
@@ -166,19 +166,10 @@ class SessionModelAssociator
const SessionID::id_type tab_id,
const SessionTab** tab);
- // Specifies whether the window has tabs to sync. The new tab page does not
- // count. If no tabs to sync, it returns true, otherwise false;
- static bool SessionWindowHasNoTabsToSync(const SessionWindow& window);
-
// Control which local tabs we're interested in syncing.
// Ensures the profile matches sync's profile and that the tab has at least
// one navigation entry and is not an empty tab.
- bool IsValidTab(const SyncedTabDelegate& tab);
-
- // Control which foreign tabs we're interested in displaying.
- // Checks that the tab has navigations and is not a new tab.
- // Note: a new tab page with back/forward history is valid.
- static bool IsValidSessionTab(const SessionTab& tab);
+ bool IsValidTab(const SyncedTabDelegate& tab) const;
// Returns the syncable model type.
static syncable::ModelType model_type() { return syncable::SESSIONS; }
« no previous file with comments | « chrome/browser/sessions/session_restore.cc ('k') | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698