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

Adapt to changes of Chrome 51 API changes (Part 2)

Browse source
This commit is contained in:
Cheng Zhao 2016-05-23 12:28:59 +09:00
parent 7ba391da7c
commit a2bd55dd3c
48 changed files with 131 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,7 @@ void PrintJob::StartPrinting() {
make_scoped_refptr(this),
base::Bind(&PrintJobWorker::StartPrinting,
base::Unretained(worker_.get()),
document_)));
base::RetainedRef(document_))));
// Set the flag right now.
is_job_pending_ = true;
@ -267,7 +267,7 @@ class PrintJob::PdfToEmfState {
int pages_in_progress_;
gfx::Size page_size_;
gfx::Rect content_area_;
scoped_ptr<PdfToEmfConverter> converter_;
std::unique_ptr<PdfToEmfConverter> converter_;
};
void PrintJob::StartPdfToEmfConversion(
@ -296,7 +296,7 @@ void PrintJob::OnPdfToEmfStarted(int page_count) {
void PrintJob::OnPdfToEmfPageConverted(int page_number,
float scale_factor,
scoped_ptr<MetafilePlayer> emf) {
std::unique_ptr<MetafilePlayer> emf) {
DCHECK(ptd_to_emf_state_);
if (!document_.get() || !emf) {
ptd_to_emf_state_.reset();
@ -335,7 +335,7 @@ void PrintJob::UpdatePrintedDocument(PrintedDocument* new_document) {
make_scoped_refptr(this),
base::Bind(&PrintJobWorker::OnDocumentChanged,
base::Unretained(worker_.get()),
document_)));
base::RetainedRef(document_))));
}
}