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

Side by Side Diff: chrome/browser/chromeos/policy/remote_commands/screenshot_delegate.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/chromeos/policy/remote_commands/screenshot_delegate.h" 5 #include "chrome/browser/chromeos/policy/remote_commands/screenshot_delegate.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 9 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
9 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 10 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
10 #include "chrome/browser/chromeos/policy/status_uploader.h" 11 #include "chrome/browser/chromeos/policy/status_uploader.h"
11 #include "chrome/browser/chromeos/policy/upload_job_impl.h" 12 #include "chrome/browser/chromeos/policy/upload_job_impl.h"
12 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 13 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
13 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 14 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
14 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
15 16
16 namespace policy { 17 namespace policy {
(...skipping 21 matching lines...) Expand all
38 void ScreenshotDelegate::TakeSnapshot( 39 void ScreenshotDelegate::TakeSnapshot(
39 gfx::NativeWindow window, 40 gfx::NativeWindow window,
40 const gfx::Rect& source_rect, 41 const gfx::Rect& source_rect,
41 const ui::GrabWindowSnapshotAsyncPNGCallback& callback) { 42 const ui::GrabWindowSnapshotAsyncPNGCallback& callback) {
42 ui::GrabWindowSnapshotAsync( 43 ui::GrabWindowSnapshotAsync(
43 window, source_rect, blocking_task_runner_, 44 window, source_rect, blocking_task_runner_,
44 base::Bind(&ScreenshotDelegate::StoreScreenshot, 45 base::Bind(&ScreenshotDelegate::StoreScreenshot,
45 weak_ptr_factory_.GetWeakPtr(), callback)); 46 weak_ptr_factory_.GetWeakPtr(), callback));
46 } 47 }
47 48
48 scoped_ptr<UploadJob> ScreenshotDelegate::CreateUploadJob( 49 std::unique_ptr<UploadJob> ScreenshotDelegate::CreateUploadJob(
49 const GURL& upload_url, 50 const GURL& upload_url,
50 UploadJob::Delegate* delegate) { 51 UploadJob::Delegate* delegate) {
51 chromeos::DeviceOAuth2TokenService* device_oauth2_token_service = 52 chromeos::DeviceOAuth2TokenService* device_oauth2_token_service =
52 chromeos::DeviceOAuth2TokenServiceFactory::Get(); 53 chromeos::DeviceOAuth2TokenServiceFactory::Get();
53 54
54 scoped_refptr<net::URLRequestContextGetter> system_request_context = 55 scoped_refptr<net::URLRequestContextGetter> system_request_context =
55 g_browser_process->system_request_context(); 56 g_browser_process->system_request_context();
56 std::string robot_account_id = 57 std::string robot_account_id =
57 device_oauth2_token_service->GetRobotAccountId(); 58 device_oauth2_token_service->GetRobotAccountId();
58 return scoped_ptr<UploadJob>(new UploadJobImpl( 59 return std::unique_ptr<UploadJob>(new UploadJobImpl(
59 upload_url, robot_account_id, device_oauth2_token_service, 60 upload_url, robot_account_id, device_oauth2_token_service,
60 system_request_context, delegate, 61 system_request_context, delegate,
61 make_scoped_ptr(new UploadJobImpl::RandomMimeBoundaryGenerator))); 62 base::WrapUnique(new UploadJobImpl::RandomMimeBoundaryGenerator)));
62 } 63 }
63 64
64 void ScreenshotDelegate::StoreScreenshot( 65 void ScreenshotDelegate::StoreScreenshot(
65 const ui::GrabWindowSnapshotAsyncPNGCallback& callback, 66 const ui::GrabWindowSnapshotAsyncPNGCallback& callback,
66 scoped_refptr<base::RefCountedBytes> png_data) { 67 scoped_refptr<base::RefCountedBytes> png_data) {
67 callback.Run(png_data); 68 callback.Run(png_data);
68 } 69 }
69 70
70 } // namespace policy 71 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698