| OLD | NEW |
| 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_CORE_SERIALIZED_NAVIGATION_ENTRY_H_ |
| 6 #define COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_ | 6 #define COMPONENTS_SESSIONS_CORE_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/core/sessions_export.h" |
| 17 #include "ui/base/page_transition_types.h" | 17 #include "ui/base/page_transition_types.h" |
| 18 #include "url/gurl.h" | 18 #include "url/gurl.h" |
| 19 | 19 |
| 20 namespace base { | 20 namespace base { |
| 21 class Pickle; | 21 class Pickle; |
| 22 class PickleIterator; | 22 class PickleIterator; |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace sync_pb { | 25 namespace sync_pb { |
| 26 class TabNavigation; | 26 class TabNavigation; |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 bool is_restored_; // Not persisted. | 136 bool is_restored_; // Not persisted. |
| 137 std::vector<GURL> redirect_chain_; // Not persisted. | 137 std::vector<GURL> redirect_chain_; // Not persisted. |
| 138 | 138 |
| 139 // Additional information. | 139 // Additional information. |
| 140 BlockedState blocked_state_; | 140 BlockedState blocked_state_; |
| 141 std::set<std::string> content_pack_categories_; | 141 std::set<std::string> content_pack_categories_; |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 } // namespace sessions | 144 } // namespace sessions |
| 145 | 145 |
| 146 #endif // COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_ | 146 #endif // COMPONENTS_SESSIONS_CORE_SERIALIZED_NAVIGATION_ENTRY_H_ |
| OLD | NEW |