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

Unified Diff: ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

Issue 1874903003: Reversed WebState <-> CRWWebController ownership. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self review Created 4 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 side-by-side diff with in-line comments
Download patch
Index: ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
index ece3a51c7f1c7ba0c2303f93748c42398bdcfc46..88b975c0bbe4c45852ad3276f19dc343c4c82380 100644
--- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
+++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
@@ -352,11 +352,11 @@ NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) {
#pragma mark CRWWebController public methods
-- (instancetype)initWithWebState:(std::unique_ptr<web::WebStateImpl>)webState {
- DCHECK(webState);
- web::BrowserState* browserState = webState->GetBrowserState();
- self = [super initWithWebState:std::move(webState)];
+- (instancetype)initWithWebState:(web::WebStateImpl*)webState {
+ self = [super initWithWebState:webState];
if (self) {
+ DCHECK(webState);
+ web::BrowserState* browserState = webState->GetBrowserState();
_certVerificationController.reset([[CRWCertVerificationController alloc]
initWithBrowserState:browserState]);
_certVerificationErrors.reset(

Powered by Google App Engine
This is Rietveld 408576698