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

Side by Side Diff: components/sessions/serialized_navigation_entry.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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 unified diff | Download patch
« no previous file with comments | « components/sessions/DEPS ('k') | components/sessions/serialized_navigation_entry.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_ 5 #ifndef COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_
6 #define COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_ 6 #define COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "components/sessions/sessions_export.h" 16 #include "components/sessions/sessions_export.h"
17 #include "content/public/common/page_state.h" 17 #include "content/public/common/page_state.h"
18 #include "content/public/common/page_transition_types.h"
19 #include "content/public/common/referrer.h" 18 #include "content/public/common/referrer.h"
19 #include "ui/base/page_transition_types.h"
20 #include "url/gurl.h" 20 #include "url/gurl.h"
21 21
22 class Pickle; 22 class Pickle;
23 class PickleIterator; 23 class PickleIterator;
24 24
25 namespace content { 25 namespace content {
26 class BrowserContext; 26 class BrowserContext;
27 class NavigationEntry; 27 class NavigationEntry;
28 } 28 }
29 29
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 // Accessors for some fields taken from NavigationEntry. 96 // Accessors for some fields taken from NavigationEntry.
97 int unique_id() const { return unique_id_; } 97 int unique_id() const { return unique_id_; }
98 const GURL& virtual_url() const { return virtual_url_; } 98 const GURL& virtual_url() const { return virtual_url_; }
99 const base::string16& title() const { return title_; } 99 const base::string16& title() const { return title_; }
100 const content::PageState& page_state() const { return page_state_; } 100 const content::PageState& page_state() const { return page_state_; }
101 const base::string16& search_terms() const { return search_terms_; } 101 const base::string16& search_terms() const { return search_terms_; }
102 const GURL& favicon_url() const { return favicon_url_; } 102 const GURL& favicon_url() const { return favicon_url_; }
103 int http_status_code() const { return http_status_code_; } 103 int http_status_code() const { return http_status_code_; }
104 const content::Referrer& referrer() const { return referrer_; } 104 const content::Referrer& referrer() const { return referrer_; }
105 content::PageTransition transition_type() const { 105 ui::PageTransition transition_type() const {
106 return transition_type_; 106 return transition_type_;
107 } 107 }
108 bool has_post_data() const { return has_post_data_; } 108 bool has_post_data() const { return has_post_data_; }
109 int64 post_id() const { return post_id_; } 109 int64 post_id() const { return post_id_; }
110 const GURL& original_request_url() const { return original_request_url_; } 110 const GURL& original_request_url() const { return original_request_url_; }
111 bool is_overriding_user_agent() const { return is_overriding_user_agent_; } 111 bool is_overriding_user_agent() const { return is_overriding_user_agent_; }
112 base::Time timestamp() const { return timestamp_; } 112 base::Time timestamp() const { return timestamp_; }
113 113
114 BlockedState blocked_state() { return blocked_state_; } 114 BlockedState blocked_state() { return blocked_state_; }
115 void set_blocked_state(BlockedState blocked_state) { 115 void set_blocked_state(BlockedState blocked_state) {
(...skipping 24 matching lines...) Expand all
140 140
141 // Index in the NavigationController. 141 // Index in the NavigationController.
142 int index_; 142 int index_;
143 143
144 // Member variables corresponding to NavigationEntry fields. 144 // Member variables corresponding to NavigationEntry fields.
145 int unique_id_; 145 int unique_id_;
146 content::Referrer referrer_; 146 content::Referrer referrer_;
147 GURL virtual_url_; 147 GURL virtual_url_;
148 base::string16 title_; 148 base::string16 title_;
149 content::PageState page_state_; 149 content::PageState page_state_;
150 content::PageTransition transition_type_; 150 ui::PageTransition transition_type_;
151 bool has_post_data_; 151 bool has_post_data_;
152 int64 post_id_; 152 int64 post_id_;
153 GURL original_request_url_; 153 GURL original_request_url_;
154 bool is_overriding_user_agent_; 154 bool is_overriding_user_agent_;
155 base::Time timestamp_; 155 base::Time timestamp_;
156 base::string16 search_terms_; 156 base::string16 search_terms_;
157 GURL favicon_url_; 157 GURL favicon_url_;
158 int http_status_code_; 158 int http_status_code_;
159 bool is_restored_; // Not persisted. 159 bool is_restored_; // Not persisted.
160 std::vector<GURL> redirect_chain_; // Not persisted. 160 std::vector<GURL> redirect_chain_; // Not persisted.
161 161
162 // Additional information. 162 // Additional information.
163 BlockedState blocked_state_; 163 BlockedState blocked_state_;
164 std::set<std::string> content_pack_categories_; 164 std::set<std::string> content_pack_categories_;
165 }; 165 };
166 166
167 } // namespace sessions 167 } // namespace sessions
168 168
169 #endif // COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_ 169 #endif // COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_
OLDNEW
« no previous file with comments | « components/sessions/DEPS ('k') | components/sessions/serialized_navigation_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698