Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/printing/print_view_manager_base.h b/src/chrome/browser/printing/print_view_manager_base.h
index 298fa76..3de5a46 100644 (file)
--- a/src/chrome/browser/printing/print_view_manager_base.h
+++ b/src/chrome/browser/printing/print_view_manager_base.h
@@ -23,6 +23,7 @@ class RenderViewHost;
 namespace printing {
 
 class JobEventDetails;
+class MetafilePlayer;
 class PrintJob;
 class PrintJobWorkerOwner;
 class PrintQueriesQueue;
@@ -34,16 +35,18 @@ class PrintViewManagerBase : public content::NotificationObserver,
  public:
   virtual ~PrintViewManagerBase();
 
+#if !defined(DISABLE_BASIC_PRINTING)
   // Prints the current document immediately. Since the rendering is
   // asynchronous, the actual printing will not be completed on the return of
   // this function. Returns false if printing is impossible at the moment.
   virtual bool PrintNow();
+#endif  // !DISABLE_BASIC_PRINTING
 
   // Whether to block scripted printing for our tab or not.
   void UpdateScriptedPrintingBlocked();
 
   // PrintedPagesSource implementation.
-  virtual string16 RenderSourceName() OVERRIDE;
+  virtual base::string16 RenderSourceName() OVERRIDE;
 
  protected:
   explicit PrintViewManagerBase(content::WebContents* web_contents);
@@ -77,6 +80,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
   void OnDidGetPrintedPagesCount(int cookie, int number_pages);
   void OnDidGetDocumentCookie(int cookie);
   void OnDidPrintPage(const PrintHostMsg_DidPrintPage_Params& params);
+  void OnShowInvalidPrinterSettingsError();
 
   // Processes a NOTIFY_PRINT_JOB_EVENT notification.
   void OnNotifyPrintJobEvent(const JobEventDetails& event_details);
@@ -145,10 +149,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // print settings are being loaded.
   bool inside_inner_message_loop_;
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if !defined(OS_MACOSX)
   // Set to true when OnDidPrintPage() should be expecting the first page.
   bool expecting_first_page_;
-#endif
+#endif  // OS_MACOSX
 
   // The document cookie of the current PrinterQuery.
   int cookie_;