Add support for printing selection only flag. This only adds the flag to the IPC and implements the Windows dialog interaction but does not enable this just yet.

BUG=http://crbug.com/1682
TEST=none

Review URL: http://codereview.chromium.org/118338

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17867 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 4 deletions

diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 76341c5..4f10abf 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -291,19 +291,23 @@ struct ViewMsg_Print_Params {
   // Cookie for the document to ensure correctness.
   int document_cookie;
 
+  // Should only print currently selected text.
+  bool selection_only;
+
   // Warning: do not compare document_cookie.
   bool Equals(const ViewMsg_Print_Params& rhs) const {
     return printable_size == rhs.printable_size &&
            dpi == rhs.dpi &&
            min_shrink == rhs.min_shrink &&
            max_shrink == rhs.max_shrink &&
-           desired_dpi == rhs.desired_dpi;
+           desired_dpi == rhs.desired_dpi &&
+           selection_only == rhs.selection_only;
   }
 
   // Checking if the current params is empty. Just initialized after a memset.
   bool IsEmpty() const {
     return !document_cookie && !desired_dpi && !max_shrink && !min_shrink &&
-           !dpi && printable_size.IsEmpty();
+           !dpi && printable_size.IsEmpty() && !selection_only;
   }
 };
 
@@ -1426,6 +1430,7 @@ struct ParamTraits<ViewMsg_Print_Params> {
     WriteParam(m, p.max_shrink);
     WriteParam(m, p.desired_dpi);
     WriteParam(m, p.document_cookie);
+    WriteParam(m, p.selection_only);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return ReadParam(m, iter, &p->printable_size) &&
@@ -1433,7 +1438,8 @@ struct ParamTraits<ViewMsg_Print_Params> {
            ReadParam(m, iter, &p->min_shrink) &&
            ReadParam(m, iter, &p->max_shrink) &&
            ReadParam(m, iter, &p->desired_dpi) &&
-           ReadParam(m, iter, &p->document_cookie);
+           ReadParam(m, iter, &p->document_cookie) &&
+           ReadParam(m, iter, &p->selection_only);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<ViewMsg_Print_Params>");
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 655df6a..d6d56bf 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1070,10 +1070,11 @@ IPC_BEGIN_MESSAGES(ViewHost)
   // by javascript. This step is about showing UI to the user to select the
   // final print settings. The output parameter is the same as
   // ViewMsg_PrintPages which is executed implicitly.
-  IPC_SYNC_MESSAGE_ROUTED3_1(ViewHostMsg_ScriptedPrint,
+  IPC_SYNC_MESSAGE_ROUTED4_1(ViewHostMsg_ScriptedPrint,
                              gfx::NativeViewId /* host_window */,
                              int /* cookie */,
                              int /* expected_pages_count */,
+                             bool /* has_selection */,
                              ViewMsg_PrintPages_Params /* settings choosen by
                                                           the user*/)
 #endif  // defined(OS_WIN)
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index dfdb277..c800f32 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -105,6 +105,7 @@ class PrinterQuery : public base::RefCountedThreadSafe<PrinterQuery> {
   void GetSettings(GetSettingsAskParam ask_user_for_settings,
                    int parent_window,
                    int expected_page_count,
+                   bool has_selection,
                    CancelableTask* callback) { NOTIMPLEMENTED(); }
   PrintingContext::Result last_status() { return PrintingContext::FAILED; }
   const PrintSettings& settings() { NOTIMPLEMENTED(); return settings_; }