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

Unified Diff: chrome/browser/sync/glue/synced_session_tracker.cc

Issue 1408643002: [Sync] Componentize synced_tab_delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test broken by rebase Created 5 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
Index: chrome/browser/sync/glue/synced_session_tracker.cc
diff --git a/chrome/browser/sync/glue/synced_session_tracker.cc b/chrome/browser/sync/glue/synced_session_tracker.cc
index 1a31dca5341c6d966b59b17e7128326d2228837c..ef45b2eef763ded38e2a80bbd6bbd296b78e3b9c 100644
--- a/chrome/browser/sync/glue/synced_session_tracker.cc
+++ b/chrome/browser/sync/glue/synced_session_tracker.cc
@@ -7,13 +7,33 @@
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/sync/glue/synced_session_util.h"
+#include "components/sync_sessions/sync_sessions_client.h"
namespace browser_sync {
-SyncedSessionTracker::SyncedSessionTracker() {
+namespace {
+
+// Helper for iterating through all tabs within a window, and all navigations
+// within a tab, to find if there's a valid syncable url.
+bool ShouldSyncSessionWindow(sync_sessions::SyncSessionsClient* sessions_client,
+ const sessions::SessionWindow& window) {
+ for (sessions::SessionTab* const tab : window.tabs) {
+ for (const sessions::SerializedNavigationEntry& navigation :
+ tab->navigations) {
+ if (sessions_client->ShouldSyncURL(navigation.virtual_url())) {
+ return true;
+ }
+ }
+ }
+ return false;
}
+} // namespace
+
+SyncedSessionTracker::SyncedSessionTracker(
+ sync_sessions::SyncSessionsClient* sessions_client)
+ : sessions_client_(sessions_client) {}
+
SyncedSessionTracker::~SyncedSessionTracker() {
Clear();
}
@@ -37,7 +57,7 @@ bool SyncedSessionTracker::LookupAllForeignSessions(
for (sync_driver::SyncedSession::SyncedWindowMap::const_iterator iter =
foreign_session->windows.begin();
iter != foreign_session->windows.end(); ++iter) {
- if (ShouldSyncSessionWindow(*(iter->second))) {
+ if (ShouldSyncSessionWindow(sessions_client_, *(iter->second))) {
found_tabs = true;
break;
}

Powered by Google App Engine
This is Rietveld 408576698