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

Side by Side Diff: ui/snapshot/snapshot_android.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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
« no previous file with comments | « ui/snapshot/screenshot_grabber.h ('k') | ui/snapshot/snapshot_async.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/snapshot/snapshot.h" 5 #include "ui/snapshot/snapshot.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 21 matching lines...) Expand all
32 std::vector<unsigned char>* png_representation, 32 std::vector<unsigned char>* png_representation,
33 const gfx::Rect& snapshot_bounds) { 33 const gfx::Rect& snapshot_bounds) {
34 // Not supported in Android. Callers should fall back to the async version. 34 // Not supported in Android. Callers should fall back to the async version.
35 return false; 35 return false;
36 } 36 }
37 37
38 static void MakeAsyncCopyRequest( 38 static void MakeAsyncCopyRequest(
39 gfx::NativeWindow window, 39 gfx::NativeWindow window,
40 const gfx::Rect& source_rect, 40 const gfx::Rect& source_rect,
41 const cc::CopyOutputRequest::CopyOutputRequestCallback& callback) { 41 const cc::CopyOutputRequest::CopyOutputRequestCallback& callback) {
42 scoped_ptr<cc::CopyOutputRequest> request = 42 std::unique_ptr<cc::CopyOutputRequest> request =
43 cc::CopyOutputRequest::CreateBitmapRequest(callback); 43 cc::CopyOutputRequest::CreateBitmapRequest(callback);
44 44
45 const gfx::Display& display = gfx::Screen::GetScreen()->GetPrimaryDisplay(); 45 const gfx::Display& display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
46 float device_scale_factor = display.device_scale_factor(); 46 float device_scale_factor = display.device_scale_factor();
47 gfx::Rect source_rect_in_pixel = 47 gfx::Rect source_rect_in_pixel =
48 gfx::ScaleToEnclosingRect(source_rect, device_scale_factor); 48 gfx::ScaleToEnclosingRect(source_rect, device_scale_factor);
49 49
50 // Account for the toolbar offset. 50 // Account for the toolbar offset.
51 gfx::Vector2dF offset = window->content_offset(); 51 gfx::Vector2dF offset = window->content_offset();
52 gfx::Rect adjusted_source_rect(gfx::ToRoundedPoint( 52 gfx::Rect adjusted_source_rect(gfx::ToRoundedPoint(
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 void GrabViewSnapshotAsync( 87 void GrabViewSnapshotAsync(
88 gfx::NativeView view, 88 gfx::NativeView view,
89 const gfx::Rect& source_rect, 89 const gfx::Rect& source_rect,
90 scoped_refptr<base::TaskRunner> background_task_runner, 90 scoped_refptr<base::TaskRunner> background_task_runner,
91 const GrabWindowSnapshotAsyncPNGCallback& callback) { 91 const GrabWindowSnapshotAsyncPNGCallback& callback) {
92 GrabWindowSnapshotAsync( 92 GrabWindowSnapshotAsync(
93 view->GetWindowAndroid(), source_rect, background_task_runner, callback); 93 view->GetWindowAndroid(), source_rect, background_task_runner, callback);
94 } 94 }
95 95
96 } // namespace ui 96 } // namespace ui
OLDNEW
« no previous file with comments | « ui/snapshot/screenshot_grabber.h ('k') | ui/snapshot/snapshot_async.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698