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

Side by Side Diff: ios/web/web_state/ui/crw_web_controller_container_view.h

Issue 2916473002: [ObjC ARC] Converts ios/web:web to ARC. (Closed)
Patch Set: Adoption of NS_VALID_UNTIL_END_OF_SCOPE Created 3 years, 6 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 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 #ifndef IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_CONTAINER_VIEW_H_ 5 #ifndef IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_CONTAINER_VIEW_H_
6 #define IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_CONTAINER_VIEW_H_ 6 #define IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_CONTAINER_VIEW_H_
7 7
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #import "ios/web/public/web_state/ui/crw_content_view.h" 10 #import "ios/web/public/web_state/ui/crw_content_view.h"
(...skipping 15 matching lines...) Expand all
26 (CRWWebControllerContainerView*)containerView; 26 (CRWWebControllerContainerView*)containerView;
27 27
28 @end 28 @end
29 29
30 // Container view class that manages the display of content within 30 // Container view class that manages the display of content within
31 // CRWWebController. 31 // CRWWebController.
32 @interface CRWWebControllerContainerView : UIView 32 @interface CRWWebControllerContainerView : UIView
33 33
34 #pragma mark Content Views 34 #pragma mark Content Views
35 // The web view content view being displayed. 35 // The web view content view being displayed.
36 @property(nonatomic, retain, readonly) 36 @property(nonatomic, strong, readonly)
37 CRWWebViewContentView* webViewContentView; 37 CRWWebViewContentView* webViewContentView;
38 // The native controller whose content is being displayed. 38 // The native controller whose content is being displayed.
39 @property(nonatomic, retain, readonly) id<CRWNativeContent> nativeController; 39 @property(nonatomic, strong, readonly) id<CRWNativeContent> nativeController;
40 // The currently displayed transient content view. 40 // The currently displayed transient content view.
41 @property(nonatomic, retain, readonly) CRWContentView* transientContentView; 41 @property(nonatomic, strong, readonly) CRWContentView* transientContentView;
42 @property(nonatomic, assign) id<CRWWebControllerContainerViewDelegate> 42 @property(nonatomic, weak) id<CRWWebControllerContainerViewDelegate>
43 delegate; // weak 43 delegate; // weak
Eugene But (OOO till 7-30) 2017/06/02 23:18:37 Remove |// weak|.
PL 2017/06/05 23:26:18 Done!
44 44
45 // Designated initializer. |proxy|'s content view will be updated as different 45 // Designated initializer. |proxy|'s content view will be updated as different
46 // content is added to the container. 46 // content is added to the container.
47 - (instancetype)initWithDelegate: 47 - (instancetype)initWithDelegate:
48 (id<CRWWebControllerContainerViewDelegate>)delegate 48 (id<CRWWebControllerContainerViewDelegate>)delegate
49 NS_DESIGNATED_INITIALIZER; 49 NS_DESIGNATED_INITIALIZER;
50 50
51 // CRWWebControllerContainerView should be initialized via 51 // CRWWebControllerContainerView should be initialized via
52 // |-initWithContentViewProxy:|. 52 // |-initWithContentViewProxy:|.
53 - (instancetype)initWithCoder:(NSCoder*)decoder NS_UNAVAILABLE; 53 - (instancetype)initWithCoder:(NSCoder*)decoder NS_UNAVAILABLE;
(...skipping 28 matching lines...) Expand all
82 82
83 // Removes |toolbar| as a subview. 83 // Removes |toolbar| as a subview.
84 - (void)removeToolbar:(UIView*)toolbar; 84 - (void)removeToolbar:(UIView*)toolbar;
85 85
86 // Removes all toolbars added via |-addToolbar:|. 86 // Removes all toolbars added via |-addToolbar:|.
87 - (void)removeAllToolbars; 87 - (void)removeAllToolbars;
88 88
89 @end 89 @end
90 90
91 #endif // IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_CONTAINER_VIEW_H_ 91 #endif // IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_CONTAINER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698