Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / printing / pdf_to_emf_converter.cc

diff --git a/src/chrome/browser/printing/pdf_to_emf_converter.cc b/src/chrome/browser/printing/pdf_to_emf_converter.cc
index f0e998b..48a3845 100644 (file)
--- a/src/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/src/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -61,8 +61,8 @@ class LazyEmf : public MetafilePlayer {
       : temp_dir_(temp_dir), file_(file.Pass()) {}
   virtual ~LazyEmf() { Close(); }
 
-  virtual bool SafePlayback(HDC hdc) const OVERRIDE;
-  virtual bool SaveTo(base::File* file) const OVERRIDE;
+  virtual bool SafePlayback(HDC hdc) const override;
+  virtual bool SaveTo(base::File* file) const override;
 
  private:
   void Close() const;
@@ -103,9 +103,9 @@ class PdfToEmfUtilityProcessHostClient
   void Stop();
 
   // UtilityProcessHostClient implementation.
-  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
-  virtual void OnProcessLaunchFailed() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnProcessCrashed(int exit_code) override;
+  virtual void OnProcessLaunchFailed() override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   class GetPageCallbackData {
@@ -147,7 +147,7 @@ class PdfToEmfUtilityProcessHostClient
   // Message handlers.
   void OnProcessStarted();
   void OnPageCount(int page_count);
-  void OnPageDone(bool success, double scale_factor);
+  void OnPageDone(bool success, float scale_factor);
 
   void OnFailed();
   void OnTempPdfReady(ScopedTempFile pdf);
@@ -183,10 +183,10 @@ class PdfToEmfConverterImpl : public PdfToEmfConverter {
 
   virtual void Start(const scoped_refptr<base::RefCountedMemory>& data,
                      const PdfRenderSettings& conversion_settings,
-                     const StartCallback& start_callback) OVERRIDE;
+                     const StartCallback& start_callback) override;
 
   virtual void GetPage(int page_number,
-                       const GetPageCallback& get_page_callback) OVERRIDE;
+                       const GetPageCallback& get_page_callback) override;
 
   // Helps to cancel callbacks if this object is destroyed.
   void RunCallback(const base::Closure& callback);
@@ -386,7 +386,7 @@ void PdfToEmfUtilityProcessHostClient::OnTempEmfReady(
 }
 
 void PdfToEmfUtilityProcessHostClient::OnPageDone(bool success,
-                                                  double scale_factor) {
+                                                  float scale_factor) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (get_page_callbacks_.empty())
     return OnFailed();
@@ -450,7 +450,7 @@ void PdfToEmfUtilityProcessHostClient::OnFailed() {
   if (!start_callback_.is_null())
     OnPageCount(0);
   while (!get_page_callbacks_.empty())
-    OnPageDone(false, 0.0);
+    OnPageDone(false, 0.0f);
   utility_process_host_.reset();
 }