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

Side by Side Diff: ui/views_content_client/views_content_browser_client.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 #include "ui/views_content_client/views_content_browser_client.h" 5 #include "ui/views_content_client/views_content_browser_client.h"
6 6
7 #include <utility>
8
7 #include "content/shell/browser/shell_browser_context.h" 9 #include "content/shell/browser/shell_browser_context.h"
8 #include "ui/views_content_client/views_content_client_main_parts.h" 10 #include "ui/views_content_client/views_content_client_main_parts.h"
9 11
10 namespace ui { 12 namespace ui {
11 13
12 ViewsContentBrowserClient::ViewsContentBrowserClient( 14 ViewsContentBrowserClient::ViewsContentBrowserClient(
13 ViewsContentClient* views_content_client) 15 ViewsContentClient* views_content_client)
14 : views_content_main_parts_(NULL), 16 : views_content_main_parts_(NULL),
15 views_content_client_(views_content_client) { 17 views_content_client_(views_content_client) {
16 } 18 }
17 19
18 ViewsContentBrowserClient::~ViewsContentBrowserClient() { 20 ViewsContentBrowserClient::~ViewsContentBrowserClient() {
19 } 21 }
20 22
21 content::BrowserMainParts* ViewsContentBrowserClient::CreateBrowserMainParts( 23 content::BrowserMainParts* ViewsContentBrowserClient::CreateBrowserMainParts(
22 const content::MainFunctionParams& parameters) { 24 const content::MainFunctionParams& parameters) {
23 views_content_main_parts_ = 25 views_content_main_parts_ =
24 ViewsContentClientMainParts::Create(parameters, views_content_client_); 26 ViewsContentClientMainParts::Create(parameters, views_content_client_);
25 return views_content_main_parts_; 27 return views_content_main_parts_;
26 } 28 }
27 29
28 net::URLRequestContextGetter* 30 net::URLRequestContextGetter*
29 ViewsContentBrowserClient::CreateRequestContext( 31 ViewsContentBrowserClient::CreateRequestContext(
30 content::BrowserContext* content_browser_context, 32 content::BrowserContext* content_browser_context,
31 content::ProtocolHandlerMap* protocol_handlers, 33 content::ProtocolHandlerMap* protocol_handlers,
32 content::URLRequestInterceptorScopedVector request_interceptors) { 34 content::URLRequestInterceptorScopedVector request_interceptors) {
33 content::ShellBrowserContext* shell_context = 35 content::ShellBrowserContext* shell_context =
34 views_content_main_parts_->browser_context(); 36 views_content_main_parts_->browser_context();
35 return shell_context->CreateRequestContext(protocol_handlers, 37 return shell_context->CreateRequestContext(protocol_handlers,
36 request_interceptors.Pass()); 38 std::move(request_interceptors));
37 } 39 }
38 40
39 } // namespace ui 41 } // namespace ui
OLDNEW
« no previous file with comments | « ui/views/window/dialog_delegate.cc ('k') | ui/views_content_client/views_content_client_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698