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

Unified Diff: ios/web/web_state/web_state_impl.h

Issue 1874903003: Reversed WebState <-> CRWWebController ownership. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged with origin/master 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
« no previous file with comments | « ios/web/web_state/ui/crw_wk_web_view_web_controller.mm ('k') | ios/web/web_state/web_state_impl.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/web_state_impl.h
diff --git a/ios/web/web_state/web_state_impl.h b/ios/web/web_state/web_state_impl.h
index 6cf970df09fc8ab7affd769d2975451b345a0942..261d87f48a705be879eb4a7e7a5737f2389d6634 100644
--- a/ios/web/web_state/web_state_impl.h
+++ b/ios/web/web_state/web_state_impl.h
@@ -62,9 +62,8 @@ class WebStateImpl : public WebState, public NavigationManagerDelegate {
WebStateImpl(BrowserState* browser_state);
~WebStateImpl() override;
- // Sets the CRWWebController that backs this object. Typically
- // |web_controller| will also take ownership of this object. This will also
- // create the WebContentsIOS facade.
+ // Gets/Sets the CRWWebController that backs this object.
+ CRWWebController* GetWebController();
void SetWebController(CRWWebController* web_controller);
// Gets or sets the delegate used to communicate with the web contents facade.
@@ -288,8 +287,8 @@ class WebStateImpl : public WebState, public NavigationManagerDelegate {
// The delegate used to pass state to the web contents facade.
WebStateFacadeDelegate* facade_delegate_;
- // The CRWWebController that backs and owns this object.
- CRWWebController* web_controller_;
+ // The CRWWebController that backs this object.
+ base::scoped_nsobject<CRWWebController> web_controller_;
NavigationManagerImpl navigation_manager_;
« no previous file with comments | « ios/web/web_state/ui/crw_wk_web_view_web_controller.mm ('k') | ios/web/web_state/web_state_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698