Upstream printing changes.

android_webview/renderer/print_web_view_helper.h

-// 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>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
@@ skipping 92 matching lines @@
     PRINT_PREVIEW_USER_INITIATED_CONTEXT_NODE,
     PRINT_PREVIEW_SCRIPTED  // triggered by window.print().
   };
 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void PrintPage(blink::WebFrame* frame, bool user_initiated) OVERRIDE;
   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.
   void OnPrintPages();
 
   // Print the document with the print preview frame/node.
   void OnPrintForSystemDialog();
 
   // Get |page_size| and |content_area| information from
   // |page_layout_in_points|.
@@ skipping 52 matching lines @@
 
   // Print / preview the node under the context menu.
   void OnPrintNodeUnderContextMenu();
 
   // Print the pages for print preview. Do not display the native print dialog
   // for user settings. |job_settings| has new print job settings values.
   void OnPrintForPrintPreview(const base::DictionaryValue& job_settings);
 
   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 -------------------------------------------------------
 
   void Print(blink::WebFrame* frame, const blink::WebNode& node);
 
   // Notification when printing is done - signal tear-down/free resources.
   void DidFinishPrinting(PrintingResult result);
 
   // Print Settings -----------------------------------------------------------
 
@@ skipping 275 matching lines @@
   bool print_node_in_progress_;
   PrintPreviewContext print_preview_context_;
   bool is_loading_;
   bool is_scripted_preview_delayed_;
   base::WeakPtrFactory<PrintWebViewHelper> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
 };
 
 }  // namespace printing
 
-#endif  // CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
+#endif  // AW_RENDERER_PRINT_WEB_VIEW_HELPER_H_