mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

replace base::MakeUnique with std::make_unique

Browse source
This commit is contained in:
Shelley Vohr 2018-04-12 08:48:32 -04:00
parent 97fb15ac49
commit b05932310b
No known key found for this signature in database
GPG key ID: F13993A75599653C
28 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chromium_src/chrome/browser/icon_loader_auralinux.cc
View file

@ -44,7 +44,7 @@ void IconLoader::ReadIcon() {
views::LinuxUI* ui = views::LinuxUI::instance();
if (ui) {
image = base::MakeUnique<gfx::Image>(
image = std::make_unique<gfx::Image>(
ui->GetIconForContentType(group_, size_pixels));
if (image->IsEmpty())
image = nullptr;

4
chromium_src/chrome/browser/icon_loader_mac.mm
View file

@ -37,7 +37,7 @@ void IconLoader::ReadIcon() {
if (icon_size_ == ALL) {
// The NSImage already has all sizes.
image = base::MakeUnique<gfx::Image>([icon retain]);
image = std::make_unique<gfx::Image>([icon retain]);
} else {
NSSize size = NSZeroSize;
switch (icon_size_) {
@ -53,7 +53,7 @@ void IconLoader::ReadIcon() {
gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));
if (!image_skia.isNull()) {
image_skia.MakeThreadSafe();
image = base::MakeUnique<gfx::Image>(image_skia);
image = std::make_unique<gfx::Image>(image_skia);
}
}

2
chromium_src/chrome/browser/icon_loader_win.cc
View file

@ -65,7 +65,7 @@ void IconLoader::ReadIcon() {
gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap,
display::win::GetDPIScale()));
image_skia.MakeThreadSafe();
image = base::MakeUnique<gfx::Image>(image_skia);
image = std::make_unique<gfx::Image>(image_skia);
DestroyIcon(file_info.hIcon);
}
}

6
chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
View file

@ -228,10 +228,10 @@ PdfConverterUtilityProcessHostClient::GetFileFromTemp(
temp_file) {
if (settings_.mode == PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2 ||
settings_.mode == PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3) {
return base::MakeUnique<PostScriptMetaFile>(temp_dir_,
return std::make_unique<PostScriptMetaFile>(temp_dir_,
std::move(temp_file));
}
return base::MakeUnique<LazyEmf>(temp_dir_, std::move(temp_file));
return std::make_unique<LazyEmf>(temp_dir_, std::move(temp_file));
}
class PdfConverterImpl : public PdfConverter {
@ -632,7 +632,7 @@ std::unique_ptr<PdfConverter> PdfConverter::StartPdfConverter(
const PdfRenderSettings& conversion_settings,
const StartCallback& start_callback) {
std::unique_ptr<PdfConverterImpl> converter =
base::MakeUnique<PdfConverterImpl>();
std::make_unique<PdfConverterImpl>();
converter->Start(
new PdfConverterUtilityProcessHostClient(converter->GetWeakPtr(),
conversion_settings),

4
chromium_src/chrome/browser/printing/print_job.cc
View file

@ -267,7 +267,7 @@ void PrintJob::StartPdfToEmfConversion(
bool print_text_with_gdi) {
DCHECK(!pdf_conversion_state_);
pdf_conversion_state_ =
base::MakeUnique<PdfConversionState>(page_size, content_area);
std::make_unique<PdfConversionState>(page_size, content_area);
const int kPrinterDpi = settings().dpi();
PdfRenderSettings settings(
content_area, gfx::Point(0, 0), kPrinterDpi, /*autorotate=*/true,
@ -314,7 +314,7 @@ void PrintJob::StartPdfToPostScriptConversion(
const gfx::Point& physical_offsets,
bool ps_level2) {
DCHECK(!pdf_conversion_state_);
pdf_conversion_state_ = base::MakeUnique<PdfConversionState>(
pdf_conversion_state_ = std::make_unique<PdfConversionState>(
gfx::Size(), gfx::Rect());
const int kPrinterDpi = settings().dpi();
PdfRenderSettings settings(

4
chromium_src/chrome/browser/printing/print_job_worker.cc
View file

@ -99,7 +99,7 @@ void PrintSettingsToJobSettings(const PrintSettings& settings,
// range
if (!settings.ranges().empty()) {
auto page_range_array = base::MakeUnique<base::ListValue>();
auto page_range_array = std::make_unique<base::ListValue>();
job_settings->Set(kSettingPageRange, std::move(page_range_array));
for (size_t i = 0; i < settings.ranges().size(); ++i) {
std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
@ -200,7 +200,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
// The object is created in the IO thread.
DCHECK(owner_->RunsTasksInCurrentSequence());
printing_context_delegate_ = base::MakeUnique<PrintingContextDelegate>(
printing_context_delegate_ = std::make_unique<PrintingContextDelegate>(
render_process_id, render_frame_id);
printing_context_ = PrintingContext::Create(printing_context_delegate_.get());
}

2
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -73,7 +73,7 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
int32_t id = rfh->GetRoutingID();
return PrintNowInternal(
rfh,
base::MakeUnique<PrintMsg_PrintPages>(id, silent, print_background, device_name));
std::make_unique<PrintMsg_PrintPages>(id, silent, print_background, device_name));
}
#endif // !DISABLE_BASIC_PRINTING

2
chromium_src/chrome/browser/process_singleton_posix.cc
View file

@ -585,7 +585,7 @@ void ProcessSingleton::LinuxWatcher::OnSocketCanReadWithoutBlocking(
DCHECK(base::SetNonBlocking(connection_socket))
<< "Failed to make non-blocking socket.";
readers_.insert(
base::MakeUnique<SocketReader>(this, ui_task_runner_, connection_socket));
std::make_unique<SocketReader>(this, ui_task_runner_, connection_socket));
}
void ProcessSingleton::LinuxWatcher::StartListening(int socket) {