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

Unified Diff: ios/web/navigation/navigation_item_impl.mm

Issue 1028603004: Upstream ios/web/navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ios-testing
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: ios/web/navigation/navigation_item_impl.mm
diff --git a/ios/web/navigation/navigation_item_impl.mm b/ios/web/navigation/navigation_item_impl.mm
index 1f86d72b5b12ddb8111ad9ecc3c8c37122a01a50..405e6c625f797a491f3dbaa49496332ea1f542f2 100644
--- a/ios/web/navigation/navigation_item_impl.mm
+++ b/ios/web/navigation/navigation_item_impl.mm
@@ -31,12 +31,41 @@ scoped_ptr<NavigationItem> NavigationItem::Create() {
NavigationItemImpl::NavigationItemImpl()
: unique_id_(GetUniqueIDInConstructor()),
page_id_(-1),
- transition_type_(ui::PAGE_TRANSITION_LINK) {
+ transition_type_(ui::PAGE_TRANSITION_LINK),
+ is_renderer_initiated_(false),
+ is_unsafe_(false),
+ facade_delegate_(nullptr) {
}
NavigationItemImpl::~NavigationItemImpl() {
}
+NavigationItemImpl::NavigationItemImpl(const NavigationItemImpl& item)
+ : unique_id_(item.unique_id_),
+ url_(item.url_),
+ referrer_(item.referrer_),
+ virtual_url_(item.virtual_url_),
+ title_(item.title_),
+ page_id_(item.page_id_),
+ transition_type_(item.transition_type_),
+ favicon_(item.favicon_),
+ ssl_(item.ssl_),
+ timestamp_(item.timestamp_),
+ is_renderer_initiated_(item.is_renderer_initiated_),
+ is_unsafe_(item.is_unsafe_),
+ cached_display_title_(item.cached_display_title_),
+ facade_delegate_(nullptr) {
+}
+
+void NavigationItemImpl::SetFacadeDelegate(
+ scoped_ptr<NavigationItemFacadeDelegate> facade_delegate) {
+ facade_delegate_ = facade_delegate.Pass();
+}
+
+NavigationItemFacadeDelegate* NavigationItemImpl::GetFacadeDelegate() const {
+ return facade_delegate_.get();
+}
+
int NavigationItemImpl::GetUniqueID() const {
return unique_id_;
}
@@ -148,4 +177,18 @@ base::Time NavigationItemImpl::GetTimestamp() const {
return timestamp_;
}
+void NavigationItemImpl::ResetForCommit() {
+ // Any state that only matters when a navigation item is pending should be
+ // cleared here.
+ set_is_renderer_initiated(false);
+}
+
+void NavigationItemImpl::SetUnsafe(bool is_unsafe) {
+ is_unsafe_ = is_unsafe;
+}
+
+bool NavigationItemImpl::IsUnsafe() const {
+ return is_unsafe_;
+}
+
} // namespace web

Powered by Google App Engine
This is Rietveld 408576698