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

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

Issue 2343463003: [Sync] Fix namespaces for the sync_sessions component. (Closed)
Patch Set: Fix Android. 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
Index: chrome/browser/sync/glue/synced_window_delegate_android.h
diff --git a/chrome/browser/sync/glue/synced_window_delegate_android.h b/chrome/browser/sync/glue/synced_window_delegate_android.h
index be3089f6ef4dd4d86ae8dc33a0f84b1a2a25f293..4ef2de4ad4fb7fe0329e8381eec5a8f916ad43e2 100644
--- a/chrome/browser/sync/glue/synced_window_delegate_android.h
+++ b/chrome/browser/sync/glue/synced_window_delegate_android.h
@@ -12,16 +12,18 @@
class TabModel;
-namespace browser_sync {
-
+namespace sync_sessions {
class SyncedTabDelegate;
+} // namespace sync_sessions
+
+namespace browser_sync {
-class SyncedWindowDelegateAndroid : public browser_sync::SyncedWindowDelegate {
+class SyncedWindowDelegateAndroid : public sync_sessions::SyncedWindowDelegate {
public:
explicit SyncedWindowDelegateAndroid(TabModel* tab_model);
~SyncedWindowDelegateAndroid() override;
- // browser_sync::SyncedWindowDelegate implementation.
+ // sync_sessions::SyncedWindowDelegate implementation.
skym 2016/09/14 22:29:58 Can you remove this newline?
maxbogue 2016/09/15 00:43:53 Done.
bool HasWindow() const override;
SessionID::id_type GetSessionId() const override;
@@ -30,8 +32,8 @@ class SyncedWindowDelegateAndroid : public browser_sync::SyncedWindowDelegate {
bool IsApp() const override;
bool IsTypeTabbed() const override;
bool IsTypePopup() const override;
- bool IsTabPinned(const SyncedTabDelegate* tab) const override;
- SyncedTabDelegate* GetTabAt(int index) const override;
+ bool IsTabPinned(const sync_sessions::SyncedTabDelegate* tab) const override;
+ sync_sessions::SyncedTabDelegate* GetTabAt(int index) const override;
SessionID::id_type GetTabIdAt(int index) const override;
bool IsSessionRestoreInProgress() const override;
bool ShouldSync() const override;
@@ -42,6 +44,6 @@ class SyncedWindowDelegateAndroid : public browser_sync::SyncedWindowDelegate {
DISALLOW_COPY_AND_ASSIGN(SyncedWindowDelegateAndroid);
};
-} // namespace browser_sync
+} // namespace browser_sync
#endif // CHROME_BROWSER_SYNC_GLUE_SYNCED_WINDOW_DELEGATE_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698