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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_view/public/criwv_web_view.h" 5 #import "ios/web_view/public/criwv_web_view.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #import "base/ios/weak_nsobject.h" 10 #import "base/ios/weak_nsobject.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/strings/sys_string_conversions.h" 12 #include "base/strings/sys_string_conversions.h"
13 #import "ios/web/public/navigation_manager.h" 13 #import "ios/web/public/navigation_manager.h"
14 #include "ios/web/public/referrer.h" 14 #include "ios/web/public/referrer.h"
15 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
15 #import "ios/web/public/web_state/ui/crw_web_delegate.h" 16 #import "ios/web/public/web_state/ui/crw_web_delegate.h"
16 #import "ios/web/public/web_state/web_state.h" 17 #import "ios/web/public/web_state/web_state.h"
17 #import "ios/web/public/web_state/web_state_delegate_bridge.h" 18 #import "ios/web/public/web_state/web_state_delegate_bridge.h"
18 #import "ios/web/public/web_state/web_state_observer_bridge.h" 19 #import "ios/web/public/web_state/web_state_observer_bridge.h"
19 #include "ios/web_view/internal/criwv_browser_state.h" 20 #include "ios/web_view/internal/criwv_browser_state.h"
20 #import "ios/web_view/internal/criwv_website_data_store_internal.h" 21 #import "ios/web_view/internal/criwv_website_data_store_internal.h"
21 #import "ios/web_view/internal/translate/criwv_translate_client.h" 22 #import "ios/web_view/internal/translate/criwv_translate_client.h"
22 #import "ios/web_view/public/criwv_web_view_configuration.h" 23 #import "ios/web_view/public/criwv_web_view_configuration.h"
23 #import "ios/web_view/public/criwv_web_view_delegate.h" 24 #import "ios/web_view/public/criwv_web_view_delegate.h"
24 #import "ios/web_view/public/criwv_website_data_store.h" 25 #import "ios/web_view/public/criwv_website_data_store.h"
25 #import "net/base/mac/url_conversions.h" 26 #import "net/base/mac/url_conversions.h"
26 #include "ui/base/page_transition_types.h" 27 #include "ui/base/page_transition_types.h"
27 #include "url/gurl.h" 28 #include "url/gurl.h"
28 29
30 #if !defined(__has_feature) || !__has_feature(objc_arc)
31 #error "This file requires ARC support."
32 #endif
33
29 @interface CRIWVWebView ()<CRWWebStateDelegate, CRWWebStateObserver> { 34 @interface CRIWVWebView ()<CRWWebStateDelegate, CRWWebStateObserver> {
30 id<CRIWVWebViewDelegate> _delegate; 35 __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.
31 CRIWVWebViewConfiguration* _configuration; 36 CRIWVWebViewConfiguration* _configuration;
32 std::unique_ptr<web::WebState> _webState; 37 std::unique_ptr<web::WebState> _webState;
33 std::unique_ptr<web::WebStateDelegateBridge> _webStateDelegate; 38 std::unique_ptr<web::WebStateDelegateBridge> _webStateDelegate;
34 std::unique_ptr<web::WebStateObserverBridge> _webStateObserver; 39 std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
35 CGFloat _loadProgress; 40 CGFloat _loadProgress;
36 } 41 }
37 42
38 @end 43 @end
39 44
40 @implementation CRIWVWebView 45 @implementation CRIWVWebView
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 loadSuccess:success]; 180 loadSuccess:success];
176 } 181 }
177 } 182 }
178 183
179 - (void)webState:(web::WebState*)webState 184 - (void)webState:(web::WebState*)webState
180 didChangeLoadingProgress:(double)progress { 185 didChangeLoadingProgress:(double)progress {
181 [self notifyDidUpdateWithChanges:CRIWVWebViewUpdateTypeProgress]; 186 [self notifyDidUpdateWithChanges:CRIWVWebViewUpdateTypeProgress];
182 } 187 }
183 188
184 @end 189 @end
OLDNEW
« 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