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

Side by Side Diff: ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/web_state/ui/crw_wk_web_view_web_controller.h" 5 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h"
6 6
7 #import <WebKit/WebKit.h>
7 #include <stddef.h> 8 #include <stddef.h>
8 #import <WebKit/WebKit.h> 9
10 #include <utility>
9 11
10 #include "base/containers/mru_cache.h" 12 #include "base/containers/mru_cache.h"
11 #include "base/ios/ios_util.h" 13 #include "base/ios/ios_util.h"
12 #include "base/ios/weak_nsobject.h" 14 #include "base/ios/weak_nsobject.h"
13 #include "base/json/json_reader.h" 15 #include "base/json/json_reader.h"
14 #import "base/mac/objc_property_releaser.h" 16 #import "base/mac/objc_property_releaser.h"
15 #import "base/mac/scoped_nsobject.h" 17 #import "base/mac/scoped_nsobject.h"
16 #include "base/macros.h" 18 #include "base/macros.h"
17 #include "base/metrics/histogram_macros.h" 19 #include "base/metrics/histogram_macros.h"
18 #include "base/strings/sys_string_conversions.h" 20 #include "base/strings/sys_string_conversions.h"
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 409
408 @end 410 @end
409 411
410 @implementation CRWWKWebViewWebController 412 @implementation CRWWKWebViewWebController
411 413
412 #pragma mark CRWWebController public methods 414 #pragma mark CRWWebController public methods
413 415
414 - (instancetype)initWithWebState:(scoped_ptr<web::WebStateImpl>)webState { 416 - (instancetype)initWithWebState:(scoped_ptr<web::WebStateImpl>)webState {
415 DCHECK(webState); 417 DCHECK(webState);
416 web::BrowserState* browserState = webState->GetBrowserState(); 418 web::BrowserState* browserState = webState->GetBrowserState();
417 self = [super initWithWebState:webState.Pass()]; 419 self = [super initWithWebState:std::move(webState)];
418 if (self) { 420 if (self) {
419 _certVerificationController.reset([[CRWCertVerificationController alloc] 421 _certVerificationController.reset([[CRWCertVerificationController alloc]
420 initWithBrowserState:browserState]); 422 initWithBrowserState:browserState]);
421 _certVerificationErrors.reset( 423 _certVerificationErrors.reset(
422 new CertVerificationErrorsCacheType(kMaxCertErrorsCount)); 424 new CertVerificationErrorsCacheType(kMaxCertErrorsCount));
423 } 425 }
424 return self; 426 return self;
425 } 427 }
426 428
427 - (BOOL)keyboardDisplayRequiresUserAction { 429 - (BOOL)keyboardDisplayRequiresUserAction {
(...skipping 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after
2047 runJavaScriptTextInputPanelWithPrompt:prompt 2049 runJavaScriptTextInputPanelWithPrompt:prompt
2048 defaultText:defaultText 2050 defaultText:defaultText
2049 requestURL:requestURL 2051 requestURL:requestURL
2050 completionHandler:completionHandler]; 2052 completionHandler:completionHandler];
2051 } else if (completionHandler) { 2053 } else if (completionHandler) {
2052 completionHandler(nil); 2054 completionHandler(nil);
2053 } 2055 }
2054 } 2056 }
2055 2057
2056 @end 2058 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698