scoped_ptr.PassAs is removed
This commit is contained in:
parent
43421aedcf
commit
5c78ecfe40
21 changed files with 84 additions and 85 deletions
|
@ -51,14 +51,14 @@ class PrintJob : public PrintJobWorkerOwner,
|
|||
// content::NotificationObserver implementation.
|
||||
virtual void Observe(int type,
|
||||
const content::NotificationSource& source,
|
||||
const content::NotificationDetails& details) OVERRIDE;
|
||||
const content::NotificationDetails& details) override;
|
||||
|
||||
// PrintJobWorkerOwner implementation.
|
||||
virtual void GetSettingsDone(const PrintSettings& new_settings,
|
||||
PrintingContext::Result result) OVERRIDE;
|
||||
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE;
|
||||
virtual const PrintSettings& settings() const OVERRIDE;
|
||||
virtual int cookie() const OVERRIDE;
|
||||
PrintingContext::Result result) override;
|
||||
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override;
|
||||
virtual const PrintSettings& settings() const override;
|
||||
virtual int cookie() const override;
|
||||
|
||||
// Starts the actual printing. Signals the worker that it should begin to
|
||||
// spool as soon as data is available.
|
||||
|
|
|
@ -66,7 +66,7 @@ class PrintJobManager : public content::NotificationObserver {
|
|||
// content::NotificationObserver
|
||||
virtual void Observe(int type,
|
||||
const content::NotificationSource& source,
|
||||
const content::NotificationDetails& details) OVERRIDE;
|
||||
const content::NotificationDetails& details) override;
|
||||
|
||||
// Returns queries queue. Never returns NULL. Must be called on Browser UI
|
||||
// Thread. Reference could be stored and used from any thread.
|
||||
|
|
|
@ -40,8 +40,8 @@ class PrintingContextDelegate : public PrintingContext::Delegate {
|
|||
PrintingContextDelegate(int render_process_id, int render_view_id);
|
||||
virtual ~PrintingContextDelegate();
|
||||
|
||||
virtual gfx::NativeView GetParentView() OVERRIDE;
|
||||
virtual std::string GetAppLocale() OVERRIDE;
|
||||
virtual gfx::NativeView GetParentView() override;
|
||||
virtual std::string GetAppLocale() override;
|
||||
|
||||
private:
|
||||
int render_process_id_;
|
||||
|
|
|
@ -144,7 +144,7 @@ void PrintViewManagerBase::OnDidPrintPage(
|
|||
#if !defined(OS_WIN)
|
||||
// Update the rendered document. It will send notifications to the listener.
|
||||
document->SetPage(params.page_number,
|
||||
metafile.PassAs<MetafilePlayer>(),
|
||||
metafile.Pass(),
|
||||
params.page_size,
|
||||
params.content_area);
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|||
#endif // !DISABLE_BASIC_PRINTING
|
||||
|
||||
// PrintedPagesSource implementation.
|
||||
virtual base::string16 RenderSourceName() OVERRIDE;
|
||||
virtual base::string16 RenderSourceName() override;
|
||||
|
||||
protected:
|
||||
explicit PrintViewManagerBase(content::WebContents* web_contents);
|
||||
|
@ -52,10 +52,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|||
bool PrintNowInternal(IPC::Message* message);
|
||||
|
||||
// Terminates or cancels the print job if one was pending.
|
||||
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
|
||||
virtual void RenderProcessGone(base::TerminationStatus status) override;
|
||||
|
||||
// content::WebContentsObserver implementation.
|
||||
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
||||
virtual bool OnMessageReceived(const IPC::Message& message) override;
|
||||
|
||||
// IPC Message handlers.
|
||||
virtual void OnPrintingFailed(int cookie);
|
||||
|
@ -64,10 +64,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|||
// content::NotificationObserver implementation.
|
||||
virtual void Observe(int type,
|
||||
const content::NotificationSource& source,
|
||||
const content::NotificationDetails& details) OVERRIDE;
|
||||
const content::NotificationDetails& details) override;
|
||||
|
||||
// Cancels the print job.
|
||||
virtual void NavigationStopped() OVERRIDE;
|
||||
virtual void NavigationStopped() override;
|
||||
|
||||
// IPC Message handlers.
|
||||
void OnDidGetPrintedPagesCount(int cookie, int number_pages);
|
||||
|
|
|
@ -32,10 +32,10 @@ class PrintViewManagerBasic
|
|||
|
||||
// content::WebContentsObserver implementation.
|
||||
// Terminates or cancels the print job if one was pending.
|
||||
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
|
||||
virtual void RenderProcessGone(base::TerminationStatus status) override;
|
||||
|
||||
// content::WebContentsObserver implementation.
|
||||
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
||||
virtual bool OnMessageReceived(const IPC::Message& message) override;
|
||||
#endif
|
||||
|
||||
private:
|
||||
|
@ -43,7 +43,7 @@ class PrintViewManagerBasic
|
|||
friend class content::WebContentsUserData<PrintViewManagerBasic>;
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
virtual void OnPrintingFailed(int cookie) OVERRIDE;
|
||||
virtual void OnPrintingFailed(int cookie) override;
|
||||
|
||||
// The file descriptor into which the PDF of the page will be written.
|
||||
base::FileDescriptor file_descriptor_;
|
||||
|
|
|
@ -33,10 +33,10 @@ class PrinterQuery : public PrintJobWorkerOwner {
|
|||
|
||||
// PrintJobWorkerOwner implementation.
|
||||
virtual void GetSettingsDone(const PrintSettings& new_settings,
|
||||
PrintingContext::Result result) OVERRIDE;
|
||||
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE;
|
||||
virtual const PrintSettings& settings() const OVERRIDE;
|
||||
virtual int cookie() const OVERRIDE;
|
||||
PrintingContext::Result result) override;
|
||||
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override;
|
||||
virtual const PrintSettings& settings() const override;
|
||||
virtual int cookie() const override;
|
||||
|
||||
// Initializes the printing context. It is fine to call this function multiple
|
||||
// times to reinitialize the settings. |web_contents_observer| can be queried
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue