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

Unified Diff: ios/web_view/internal/criwv_web_view.mm

Issue 2692603002: Convert //ios/web_view/internal to ARC. (Closed)
Patch Set: Created 3 years, 10 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_view/internal/criwv_web_view.mm
diff --git a/ios/web_view/internal/criwv_web_view.mm b/ios/web_view/internal/criwv_web_view.mm
index 2317387915ba38a8be867bf595237e17d20346e8..5f556887aefdef38c7764de3874df81bc44a9288 100644
--- a/ios/web_view/internal/criwv_web_view.mm
+++ b/ios/web_view/internal/criwv_web_view.mm
@@ -12,6 +12,7 @@
#include "base/strings/sys_string_conversions.h"
#import "ios/web/public/navigation_manager.h"
#include "ios/web/public/referrer.h"
+#import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
#import "ios/web/public/web_state/ui/crw_web_delegate.h"
#import "ios/web/public/web_state/web_state.h"
#import "ios/web/public/web_state/web_state_delegate_bridge.h"
@@ -26,8 +27,12 @@
#include "ui/base/page_transition_types.h"
#include "url/gurl.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface CRIWVWebView ()<CRWWebStateDelegate, CRWWebStateObserver> {
- id<CRIWVWebViewDelegate> _delegate;
+ __unsafe_unretained id<CRIWVWebViewDelegate> _delegate;
Eugene But (OOO till 7-30) 2017/02/10 23:07:22 Do we even need an ivar for this? Should we just h
michaeldo 2017/02/11 06:02:32 I agree, a property would be better. Updated.
CRIWVWebViewConfiguration* _configuration;
std::unique_ptr<web::WebState> _webState;
std::unique_ptr<web::WebStateDelegateBridge> _webStateDelegate;
« ios/web_view/internal/criwv.mm ('K') | « ios/web_view/internal/criwv_web_main_parts.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698