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

Side by Side Diff: chrome/browser/task_manager/web_contents_resource_provider.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 #include "chrome/browser/task_manager/web_contents_resource_provider.h" 5 #include "chrome/browser/task_manager/web_contents_resource_provider.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/prerender/prerender_manager.h" 14 #include "chrome/browser/prerender/prerender_manager.h"
13 #include "chrome/browser/prerender/prerender_manager_factory.h" 15 #include "chrome/browser/prerender/prerender_manager_factory.h"
14 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/task_manager/renderer_resource.h" 18 #include "chrome/browser/task_manager/renderer_resource.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 SiteInstance* main_frame_site_instance_; 320 SiteInstance* main_frame_site_instance_;
319 }; 321 };
320 322
321 //////////////////////////////////////////////////////////////////////////////// 323 ////////////////////////////////////////////////////////////////////////////////
322 // WebContentsResourceProvider class 324 // WebContentsResourceProvider class
323 //////////////////////////////////////////////////////////////////////////////// 325 ////////////////////////////////////////////////////////////////////////////////
324 326
325 WebContentsResourceProvider::WebContentsResourceProvider( 327 WebContentsResourceProvider::WebContentsResourceProvider(
326 TaskManager* task_manager, 328 TaskManager* task_manager,
327 scoped_ptr<WebContentsInformation> info) 329 scoped_ptr<WebContentsInformation> info)
328 : task_manager_(task_manager), info_(info.Pass()) { 330 : task_manager_(task_manager), info_(std::move(info)) {}
329 }
330 331
331 WebContentsResourceProvider::~WebContentsResourceProvider() {} 332 WebContentsResourceProvider::~WebContentsResourceProvider() {}
332 333
333 RendererResource* WebContentsResourceProvider::GetResource(int origin_pid, 334 RendererResource* WebContentsResourceProvider::GetResource(int origin_pid,
334 int child_id, 335 int child_id,
335 int route_id) { 336 int route_id) {
336 RenderFrameHost* rfh = RenderFrameHost::FromID(child_id, route_id); 337 RenderFrameHost* rfh = RenderFrameHost::FromID(child_id, route_id);
337 WebContents* web_contents = WebContents::FromRenderFrameHost(rfh); 338 WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
338 339
339 // If an origin PID was specified then the request originated in a plugin 340 // If an origin PID was specified then the request originated in a plugin
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 WebContents* web_contents, 394 WebContents* web_contents,
394 TaskManagerWebContentsEntry* entry) { 395 TaskManagerWebContentsEntry* entry) {
395 if (!entries_.erase(web_contents)) { 396 if (!entries_.erase(web_contents)) {
396 NOTREACHED(); 397 NOTREACHED();
397 return; 398 return;
398 } 399 }
399 delete entry; // Typically, this is our caller. Deletion is okay. 400 delete entry; // Typically, this is our caller. Deletion is okay.
400 } 401 }
401 402
402 } // namespace task_manager 403 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698