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

Side by Side Diff: chrome/browser/sessions/session_types.h

Issue 10125002: [Sync] Add per-navigation timestamps/unique ids to tab sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/sync/glue/session_model_associator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 27 matching lines...) Expand all
38 }; 38 };
39 39
40 TabNavigation(); 40 TabNavigation();
41 TabNavigation(int index, 41 TabNavigation(int index,
42 const GURL& virtual_url, 42 const GURL& virtual_url,
43 const content::Referrer& referrer, 43 const content::Referrer& referrer,
44 const string16& title, 44 const string16& title,
45 const std::string& state, 45 const std::string& state,
46 content::PageTransition transition); 46 content::PageTransition transition);
47 TabNavigation(const TabNavigation& tab); 47 TabNavigation(const TabNavigation& tab);
48 ~TabNavigation(); 48 virtual ~TabNavigation();
49 TabNavigation& operator=(const TabNavigation& tab); 49 TabNavigation& operator=(const TabNavigation& tab);
50 50
51 // Converts this TabNavigation into a NavigationEntry with a page id of 51 // Converts this TabNavigation into a NavigationEntry with a page id of
52 // |page_id|. The caller owns the returned NavigationEntry. 52 // |page_id|. The caller owns the returned NavigationEntry.
53 content::NavigationEntry* ToNavigationEntry(int page_id, 53 content::NavigationEntry* ToNavigationEntry(int page_id,
54 Profile* profile) const; 54 Profile* profile) const;
55 55
56 // Resets this TabNavigation from |entry|. 56 // Resets this TabNavigation from |entry|.
57 void SetFromNavigationEntry(const content::NavigationEntry& entry); 57 void SetFromNavigationEntry(const content::NavigationEntry& entry);
58 58
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 int index_; 116 int index_;
117 GURL original_request_url_; 117 GURL original_request_url_;
118 }; 118 };
119 119
120 // SessionTab ---------------------------------------------------------------- 120 // SessionTab ----------------------------------------------------------------
121 121
122 // SessionTab corresponds to a NavigationController. 122 // SessionTab corresponds to a NavigationController.
123 struct SessionTab { 123 struct SessionTab {
124 SessionTab(); 124 SessionTab();
125 ~SessionTab(); 125 virtual ~SessionTab();
126 126
127 // Unique id of the window. 127 // Unique id of the window.
128 SessionID window_id; 128 SessionID window_id;
129 129
130 // Unique if of the tab. 130 // Unique if of the tab.
131 SessionID tab_id; 131 SessionID tab_id;
132 132
133 // Visual index of the tab within its window. There may be gaps in these 133 // Visual index of the tab within its window. There may be gaps in these
134 // values. 134 // values.
135 // 135 //
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // Is the window maximized, minimized, or normal? 207 // Is the window maximized, minimized, or normal?
208 ui::WindowShowState show_state; 208 ui::WindowShowState show_state;
209 209
210 std::string app_name; 210 std::string app_name;
211 211
212 private: 212 private:
213 DISALLOW_COPY_AND_ASSIGN(SessionWindow); 213 DISALLOW_COPY_AND_ASSIGN(SessionWindow);
214 }; 214 };
215 215
216 #endif // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_ 216 #endif // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/glue/session_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698