Upstream printing changes.

android_webview/renderer/print_web_view_helper.h

Index: android_webview/renderer/print_web_view_helper.h
diff --git a/chrome/renderer/printing/print_web_view_helper.h b/android_webview/renderer/print_web_view_helper.h
similarity index 98%
copy from chrome/renderer/printing/print_web_view_helper.h
copy to android_webview/renderer/print_web_view_helper.h
index 70fb801d8944d479bb06324cf7dabb21630c4bc8..a57308478623df34aa99d4d01cf4ff57a9dc2145 100644
--- a/chrome/renderer/printing/print_web_view_helper.h
+++ b/android_webview/renderer/print_web_view_helper.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
-#define CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
+#ifndef AW_RENDERER_PRINT_WEB_VIEW_HELPER_H_
+#define AW_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 
 #include <vector>
 
@@ -116,6 +116,7 @@ class PrintWebViewHelper
   virtual void DidStartLoading() OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
 
+

[joth, 2013/11/21 19:38:03]

- \n

[sgurun-gerrit only, 2013/11/23 01:49:11]

Done.

   // Message handlers ---------------------------------------------------------
 
   // Print the document.
@@ -188,9 +189,12 @@ class PrintWebViewHelper
 
   void OnPrintingDone(bool success);
 
+public:
+  // TODO(sgurun) android_webview disables scripted prints by default.

[joth, 2013/11/21 19:38:03]

rather than the edits here, can this just be called from inside the c'tor?

This TODO is to add window.print support? That's probably best just tracked in
crbug I think.

[sgurun-gerrit only, 2013/11/23 01:49:11]

Done.

   // Enable/Disable window.print calls.  If |blocked| is true window.print
   // calls will silently fail.  Call with |blocked| set to false to reenable.
   void SetScriptedPrintBlocked(bool blocked);
+private:
 
   // Main printing code -------------------------------------------------------
 
@@ -486,4 +490,4 @@ class PrintWebViewHelper
 
 }  // namespace printing
 
-#endif  // CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
+#endif  // AW_RENDERER_PRINT_WEB_VIEW_HELPER_H_