ios/web/shell/view_controller.mm - Issue 1586833002: Convert Pass()→std::move() for iOS build.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/web/shell/view_controller.mm

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert accidental //base change 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:

Index: ios/web/shell/view_controller.mm

diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm

index 4bd2c1006693e2fcbe0f02fafd437cd1b9532336..3d3ce35486287224f120614e5e4b5937889d584d 100644

--- a/ios/web/shell/view_controller.mm

+++ b/ios/web/shell/view_controller.mm

@@ -6,6 +6,8 @@

#include <stdint.h>

+#include <utility>

#include "base/mac/objc_property_releaser.h"

#import "base/mac/scoped_nsobject.h"

#include "base/memory/scoped_ptr.h"

@@ -126,7 +128,8 @@ NSString* const kWebShellAddressFieldAccessibilityLabel = @"Address field";

webState->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, 0);

web::WebViewType webViewType =

UseWKWebView() ? web::WK_WEB_VIEW_TYPE : web::UI_WEB_VIEW_TYPE;

- _webController.reset(web::CreateWebController(webViewType, webState.Pass()));

+ _webController.reset(

+ web::CreateWebController(webViewType, std::move(webState)));

[_webController setDelegate:self];

[_webController setUIDelegate:self];

[_webController setWebUsageEnabled:YES];

« no previous file with comments | « ios/web/shell/shell_url_request_context_getter.cc ('k') | ios/web/test/web_test.mm » ('j') | no next file with comments »