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

Side by Side Diff: ios/web/web_state/ui/crw_web_controller+protected.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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 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 #ifndef IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_PROTECTED_H_ 5 #ifndef IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_PROTECTED_H_
6 #define IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_PROTECTED_H_ 6 #define IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_PROTECTED_H_
7 7
8 #import "ios/web/web_state/ui/crw_web_controller.h" 8 #import "ios/web/web_state/ui/crw_web_controller.h"
9 9
10 #import <WebKit/WebKit.h> 10 #import <WebKit/WebKit.h>
11 11
12 #include <memory>
13
12 #include "base/mac/scoped_nsobject.h" 14 #include "base/mac/scoped_nsobject.h"
13 #import "ios/web/public/navigation_manager.h" 15 #import "ios/web/public/navigation_manager.h"
14 #include "ios/web/public/referrer.h" 16 #include "ios/web/public/referrer.h"
15 #include "ios/web/public/web_state/page_display_state.h" 17 #include "ios/web/public/web_state/page_display_state.h"
16 #import "ios/web/web_state/crw_pass_kit_downloader.h" 18 #import "ios/web/web_state/crw_pass_kit_downloader.h"
17 19
18 @class CRWSessionController; 20 @class CRWSessionController;
19 namespace web { 21 namespace web {
20 struct FrameInfo; 22 struct FrameInfo;
21 class NavigationItem; 23 class NavigationItem;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 @property(nonatomic, readonly) NSString* currentReferrerString; 75 @property(nonatomic, readonly) NSString* currentReferrerString;
74 76
75 // A set of script managers whose scripts have been injected into the current 77 // A set of script managers whose scripts have been injected into the current
76 // page. 78 // page.
77 @property(nonatomic, readonly) NSMutableSet* injectedScriptManagers; 79 @property(nonatomic, readonly) NSMutableSet* injectedScriptManagers;
78 80
79 // Downloader for PassKit files. Lazy initialized. 81 // Downloader for PassKit files. Lazy initialized.
80 @property(nonatomic, readonly) CRWPassKitDownloader* passKitDownloader; 82 @property(nonatomic, readonly) CRWPassKitDownloader* passKitDownloader;
81 83
82 // Designated initializer. 84 // Designated initializer.
83 - (instancetype)initWithWebState:(scoped_ptr<web::WebStateImpl>)webState; 85 - (instancetype)initWithWebState:(std::unique_ptr<web::WebStateImpl>)webState;
84 86
85 // Creates a web view if it's not yet created. 87 // Creates a web view if it's not yet created.
86 - (void)ensureWebViewCreated; 88 - (void)ensureWebViewCreated;
87 89
88 // Destroys the web view by setting webView property to nil. 90 // Destroys the web view by setting webView property to nil.
89 - (void)resetWebView; 91 - (void)resetWebView;
90 92
91 // Returns the current URL of the web view, and sets |trustLevel| accordingly 93 // Returns the current URL of the web view, and sets |trustLevel| accordingly
92 // based on the confidence in the verification. 94 // based on the confidence in the verification.
93 - (GURL)webURLWithTrustLevel:(web::URLVerificationTrustLevel*)trustLevel; 95 - (GURL)webURLWithTrustLevel:(web::URLVerificationTrustLevel*)trustLevel;
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 365
364 // Resets pending external request information. 366 // Resets pending external request information.
365 - (void)resetExternalRequest; 367 - (void)resetExternalRequest;
366 368
367 // Converts MIME type string to WebViewDocumentType. 369 // Converts MIME type string to WebViewDocumentType.
368 - (web::WebViewDocumentType)documentTypeFromMIMEType:(NSString*)MIMEType; 370 - (web::WebViewDocumentType)documentTypeFromMIMEType:(NSString*)MIMEType;
369 371
370 @end 372 @end
371 373
372 #endif // IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_PROTECTED_H_ 374 #endif // IOS_WEB_WEB_STATE_UI_CRW_WEB_CONTROLLER_PROTECTED_H_
OLDNEW
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/ui/crw_web_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698