Update To 11.40.268.0

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

diff --git a/src/chrome/browser/printing/print_view_manager_base.cc b/src/chrome/browser/printing/print_view_manager_base.cc
index 38c5a35..84f5cf7 100644 (file)
--- a/src/chrome/browser/printing/print_view_manager_base.cc
+++ b/src/chrome/browser/printing/print_view_manager_base.cc
@@ -29,7 +29,7 @@
 #include "printing/printed_document.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/print_error_dialog.h"
 #endif
 
@@ -67,11 +67,11 @@ PrintViewManagerBase::~PrintViewManagerBase() {
   DisconnectFromCurrentPrintJob();
 }
 
-#if !defined(DISABLE_BASIC_PRINTING)
+#if defined(ENABLE_BASIC_PRINTING)
 bool PrintViewManagerBase::PrintNow() {
   return PrintNowInternal(new PrintMsg_PrintPages(routing_id()));
 }
-#endif  // !DISABLE_BASIC_PRINTING
+#endif  // ENABLE_BASIC_PRINTING
 
 void PrintViewManagerBase::UpdateScriptedPrintingBlocked() {
   Send(new PrintMsg_SetScriptedPrintingBlocked(
@@ -158,7 +158,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);
 
@@ -182,7 +182,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
     return;
   }
 
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
   chrome::ShowPrintErrorDialog();
 #endif