Initailize PrintViewManagerBasic for browser window.

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 8391a60..19bba99 100644 (file)
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -29,6 +29,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "brightray/browser/inspectable_web_contents.h"
 #include "brightray/browser/inspectable_web_contents_view.h"
+#include "chrome/browser/printing/print_view_manager_basic.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
@@ -66,6 +67,8 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
       weak_factory_(this),
       inspectable_web_contents_(
           brightray::InspectableWebContents::Create(web_contents)) {
+  printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
+
   options.Get(switches::kFrame, &has_frame_);
   options.Get(switches::kEnableLargerThanScreen, &enable_larger_than_screen_);
 

diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc
index e9a76ba..3569cde 100644 (file)
--- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc
+++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc
@@ -31,15 +31,6 @@
 #include "printing/printed_document.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_WIN)
-#include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
-#endif
-
-#if defined(ENABLE_FULL_PRINTING)
-#include "chrome/browser/printing/print_error_dialog.h"
-#endif
-
 using base::TimeDelta;
 using content::BrowserThread;
 
@@ -182,10 +173,6 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
     return;
   }
 
-#if defined(ENABLE_FULL_PRINTING)
-  chrome::ShowPrintErrorDialog();
-#endif
-
   ReleasePrinterQuery();
 
   content::NotificationService::current()->Notify(

diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
index 7d63d44..67cd1a3 100644 (file)
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
@@ -395,7 +395,7 @@ PrintMsg_Print_Params CalculatePrintParamsForCss(
 }
 
 bool IsPrintPreviewEnabled() {
-  return true;
+  return false;
 }
 
 }  // namespace