OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ | 5 #ifndef CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ |
6 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ | 6 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ |
7 | 7 |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 std::string user_agent_override; | 92 std::string user_agent_override; |
93 | 93 |
94 // Timestamp for when this tab was last modified. | 94 // Timestamp for when this tab was last modified. |
95 base::Time timestamp; | 95 base::Time timestamp; |
96 | 96 |
97 std::vector<sessions::SerializedNavigationEntry> navigations; | 97 std::vector<sessions::SerializedNavigationEntry> navigations; |
98 | 98 |
99 // For reassociating sessionStorage. | 99 // For reassociating sessionStorage. |
100 std::string session_storage_persistent_id; | 100 std::string session_storage_persistent_id; |
101 | 101 |
| 102 int64 sync_session_id; |
| 103 |
102 private: | 104 private: |
103 DISALLOW_COPY_AND_ASSIGN(SessionTab); | 105 DISALLOW_COPY_AND_ASSIGN(SessionTab); |
104 }; | 106 }; |
105 | 107 |
106 // SessionWindow ------------------------------------------------------------- | 108 // SessionWindow ------------------------------------------------------------- |
107 | 109 |
108 // Describes a saved window. | 110 // Describes a saved window. |
109 struct SessionWindow { | 111 struct SessionWindow { |
110 SessionWindow(); | 112 SessionWindow(); |
111 ~SessionWindow(); | 113 ~SessionWindow(); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 // Is the window maximized, minimized, or normal? | 147 // Is the window maximized, minimized, or normal? |
146 ui::WindowShowState show_state; | 148 ui::WindowShowState show_state; |
147 | 149 |
148 std::string app_name; | 150 std::string app_name; |
149 | 151 |
150 private: | 152 private: |
151 DISALLOW_COPY_AND_ASSIGN(SessionWindow); | 153 DISALLOW_COPY_AND_ASSIGN(SessionWindow); |
152 }; | 154 }; |
153 | 155 |
154 #endif // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ | 156 #endif // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ |
OLD | NEW |