| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_SYNC_DRIVER_GLUE_SYNCED_SESSION_H_ | 5 #ifndef COMPONENTS_SYNC_SESSIONS_SYNCED_SESSION_H_ |
| 6 #define COMPONENTS_SYNC_DRIVER_GLUE_SYNCED_SESSION_H_ | 6 #define COMPONENTS_SYNC_SESSIONS_SYNCED_SESSION_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/macros.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "components/sessions/core/session_id.h" | 13 #include "components/sessions/core/session_id.h" |
| 13 #include "components/sessions/core/session_types.h" | 14 #include "components/sessions/core/session_types.h" |
| 14 #include "sync/protocol/session_specifics.pb.h" | 15 #include "sync/protocol/session_specifics.pb.h" |
| 15 | 16 |
| 16 namespace sessions { | 17 namespace sessions { |
| 17 struct SessionWindow; | 18 struct SessionWindow; |
| 18 } | 19 } |
| 19 | 20 |
| 20 namespace sync_driver { | 21 namespace sync_driver { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // Convert this object to its protocol buffer equivalent. Shallow conversion, | 85 // Convert this object to its protocol buffer equivalent. Shallow conversion, |
| 85 // does not create SessionTab protobufs. | 86 // does not create SessionTab protobufs. |
| 86 sync_pb::SessionHeader ToSessionHeader() const; | 87 sync_pb::SessionHeader ToSessionHeader() const; |
| 87 | 88 |
| 88 private: | 89 private: |
| 89 DISALLOW_COPY_AND_ASSIGN(SyncedSession); | 90 DISALLOW_COPY_AND_ASSIGN(SyncedSession); |
| 90 }; | 91 }; |
| 91 | 92 |
| 92 } // namespace sync_driver | 93 } // namespace sync_driver |
| 93 | 94 |
| 94 #endif // COMPONENTS_SYNC_DRIVER_GLUE_SYNCED_SESSION_H_ | 95 #endif // COMPONENTS_SYNC_SESSIONS_SYNCED_SESSION_H_ |
| OLD | NEW |