From baaab31631dcff6075418c95f0220e8fb207dd50 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 15 Jul 2016 13:16:24 +0200 Subject: Adaptations to Chromium 52 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71 Reviewed-by: Michael Brüning --- src/core/print_view_manager_qt.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/print_view_manager_qt.cpp') diff --git a/src/core/print_view_manager_qt.cpp b/src/core/print_view_manager_qt.cpp index 26a6c2682..117c2e40f 100644 --- a/src/core/print_view_manager_qt.cpp +++ b/src/core/print_view_manager_qt.cpp @@ -63,7 +63,7 @@ static const qreal kMicronsToMillimeter = 1000.0f; static std::vector GetStdVectorFromHandle(base::SharedMemoryHandle handle, uint32_t data_size) { - scoped_ptr shared_buf( + std::unique_ptr shared_buf( new base::SharedMemory(handle, true)); if (!shared_buf->Map(data_size)) { @@ -76,7 +76,7 @@ GetStdVectorFromHandle(base::SharedMemoryHandle handle, uint32_t data_size) { static scoped_refptr GetBytesFromHandle(base::SharedMemoryHandle handle, uint32_t data_size) { - scoped_ptr shared_buf( + std::unique_ptr shared_buf( new base::SharedMemory(handle, true)); if (!shared_buf->Map(data_size)) { @@ -139,7 +139,7 @@ static void applyQPageLayoutSettingsToDictionary(const QPageLayout &pageLayout, { //Set page size attributes, chromium expects these in micrometers QSizeF pageSizeInMilimeter = pageLayout.pageSize().size(QPageSize::Millimeter); - scoped_ptr sizeDict(new base::DictionaryValue); + std::unique_ptr sizeDict(new base::DictionaryValue); sizeDict->SetInteger(printing::kSettingMediaSizeWidthMicrons, pageSizeInMilimeter.width() * kMicronsToMillimeter); sizeDict->SetInteger(printing::kSettingMediaSizeHeightMicrons, pageSizeInMilimeter.height() * kMicronsToMillimeter); printSettings.Set(printing::kSettingMediaSize, std::move(sizeDict)); -- cgit v1.2.3