ios/web/navigation/session_storage_builder.mm - Issue 2705673003: Removed CRWSessionEntry from CRWWebController.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ios/web/navigation/session_storage_builder.mm

Issue 2705673003: Removed CRWSessionEntry from CRWWebController. (Closed)

Patch Set: reintroduced delegate callback Created 3 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 unified diff | Download patch

« no previous file with comments | « ios/chrome/browser/tabs/tab.mm ('k') | ios/web/public/web_state/ui/crw_web_delegate.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #import "ios/web/navigation/session_storage_builder.h"	5 #import "ios/web/navigation/session_storage_builder.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/mac/foundation_util.h"	8 #include "base/mac/foundation_util.h"

9 #import "ios/web/navigation/crw_session_controller+private_constructors.h"	9 #import "ios/web/navigation/crw_session_controller+private_constructors.h"

10 #import "ios/web/navigation/crw_session_controller.h"	10 #import "ios/web/navigation/crw_session_controller.h"

11 #import "ios/web/navigation/crw_session_entry.h"

12 #import "ios/web/navigation/navigation_item_impl.h"	11 #import "ios/web/navigation/navigation_item_impl.h"

13 #import "ios/web/navigation/navigation_item_storage_builder.h"	12 #import "ios/web/navigation/navigation_item_storage_builder.h"

14 #include "ios/web/navigation/navigation_manager_impl.h"	13 #include "ios/web/navigation/navigation_manager_impl.h"

15 #import "ios/web/public/crw_session_storage.h"	14 #import "ios/web/public/crw_session_storage.h"

16 #import "ios/web/public/serializable_user_data_manager.h"	15 #import "ios/web/public/serializable_user_data_manager.h"

17 #import "ios/web/web_state/web_state_impl.h"	16 #import "ios/web/web_state/web_state_impl.h"

18	17

19 // CRWSessionController's readonly properties redefined as readwrite. These	18 // CRWSessionController's readonly properties redefined as readwrite. These

20 // will be removed and NavigationManagerImpl's ivars will be written directly	19 // will be removed and NavigationManagerImpl's ivars will be written directly

21 // as this functionality moves from CRWSessionController to	20 // as this functionality moves from CRWSessionController to

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 [session_controller	84 [session_controller

86 setSessionCertificatePolicyManager:storage	85 setSessionCertificatePolicyManager:storage

87 .sessionCertificatePolicyManager];	86 .sessionCertificatePolicyManager];

88 web_state->navigation_manager_.reset(new NavigationManagerImpl());	87 web_state->navigation_manager_.reset(new NavigationManagerImpl());

89 web_state->navigation_manager_->SetSessionController(session_controller);	88 web_state->navigation_manager_->SetSessionController(session_controller);

90 web::SerializableUserDataManager::FromWebState(web_state)	89 web::SerializableUserDataManager::FromWebState(web_state)

91 ->AddSerializableUserData(storage.userData);	90 ->AddSerializableUserData(storage.userData);

92 }	91 }

93	92

94 } // namespace web	93 } // namespace web

OLD	NEW