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

Unified Diff: ios/web/public/web_controller_factory.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/net/cert_verifier_block_adapter.cc ('k') | ios/web/shell/shell_url_request_context_getter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/public/web_controller_factory.mm
diff --git a/ios/web/public/web_controller_factory.mm b/ios/web/public/web_controller_factory.mm
index fe4641b7a82446fef03225f7c4bbd3d4f1fd6883..0235ea77e45dccf8a2d75651f39f5615ec16085d 100644
--- a/ios/web/public/web_controller_factory.mm
+++ b/ios/web/public/web_controller_factory.mm
@@ -4,6 +4,8 @@
#import "ios/web/public/web_controller_factory.h"
+#include <utility>
+
#include "ios/web/public/browser_state.h"
#import "ios/web/web_state/ui/crw_ui_web_view_web_controller.h"
#import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h"
@@ -15,11 +17,11 @@ CRWWebController* CreateWebController(WebViewType web_view_type,
scoped_ptr<WebStateImpl> web_state) {
switch (web_view_type) {
case UI_WEB_VIEW_TYPE:
- return
- [[CRWUIWebViewWebController alloc] initWithWebState:web_state.Pass()];
+ return [[CRWUIWebViewWebController alloc]
+ initWithWebState:std::move(web_state)];
case WK_WEB_VIEW_TYPE:
- return
- [[CRWWKWebViewWebController alloc] initWithWebState:web_state.Pass()];
+ return [[CRWWKWebViewWebController alloc]
+ initWithWebState:std::move(web_state)];
}
NOTREACHED();
return nil;
@@ -30,7 +32,7 @@ CRWWebController* CreateWebController(WebViewType web_view_type,
DCHECK(browser_state);
scoped_ptr<web::WebStateImpl> web_state(new web::WebStateImpl(browser_state));
web_state->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, -1);
- return CreateWebController(web_view_type, web_state.Pass());
+ return CreateWebController(web_view_type, std::move(web_state));
}
} // namespace web
« no previous file with comments | « ios/web/net/cert_verifier_block_adapter.cc ('k') | ios/web/shell/shell_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698