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

Unified Diff: chrome/browser/android/foreign_session_helper.cc

Issue 2343463003: [Sync] Fix namespaces for the sync_sessions component. (Closed)
Patch Set: Fix gn. Created 4 years, 3 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/android/favicon_helper.cc ('k') | chrome/browser/android/tab_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/foreign_session_helper.cc
diff --git a/chrome/browser/android/foreign_session_helper.cc b/chrome/browser/android/foreign_session_helper.cc
index 8b0bd4ea5a232ea5b2f044f60ee2c36b3d8ad8cf..7f51b265e24a12fe5c0a84f5507d52c17e88e2a9 100644
--- a/chrome/browser/android/foreign_session_helper.cc
+++ b/chrome/browser/android/foreign_session_helper.cc
@@ -34,8 +34,8 @@ using base::android::AttachCurrentThread;
using base::android::ConvertUTF16ToJavaString;
using base::android::ConvertUTF8ToJavaString;
using base::android::ConvertJavaStringToUTF8;
-using sync_driver::OpenTabsUIDelegate;
-using sync_driver::SyncedSession;
+using sync_sessions::OpenTabsUIDelegate;
+using sync_sessions::SyncedSession;
namespace {
@@ -74,7 +74,7 @@ bool ShouldSkipWindow(const sessions::SessionWindow& window) {
return true;
}
-bool ShouldSkipSession(const sync_driver::SyncedSession& session) {
+bool ShouldSkipSession(const SyncedSession& session) {
for (SyncedSession::SyncedWindowMap::const_iterator it =
session.windows.begin(); it != session.windows.end(); ++it) {
const sessions::SessionWindow &window = *(it->second);
@@ -216,7 +216,7 @@ jboolean ForeignSessionHelper::GetForeignSessions(
if (!open_tabs)
return false;
- std::vector<const sync_driver::SyncedSession*> sessions;
+ std::vector<const SyncedSession*> sessions;
if (!open_tabs->GetAllForeignSessions(&sessions))
return false;
@@ -234,7 +234,7 @@ jboolean ForeignSessionHelper::GetForeignSessions(
// Note: we don't own the SyncedSessions themselves.
for (size_t i = 0; i < sessions.size(); ++i) {
- const sync_driver::SyncedSession& session = *(sessions[i]);
+ const SyncedSession& session = *(sessions[i]);
if (ShouldSkipSession(session))
continue;
« no previous file with comments | « chrome/browser/android/favicon_helper.cc ('k') | chrome/browser/android/tab_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698