PrintPreview: While printing the preview data, set the initiator tab title as print job name.

printing/printing_context_mac.mm

 // Copyright (c) 2011 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.
 
 #include "printing/printing_context_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
@@ skipping 35 matching lines @@
   NSPrintPanel* panel = [NSPrintPanel printPanel];
   NSPrintInfo* printInfo = [NSPrintInfo sharedPrintInfo];
 
   NSPrintPanelOptions options = [panel options];
   options |= NSPrintPanelShowsPaperSize;
   options |= NSPrintPanelShowsOrientation;
   options |= NSPrintPanelShowsScaling;
   [panel setOptions:options];
 
   // Set the print job title text.
-  if (parent_view) {
-    NSString* job_title = [[parent_view window] title];
-    if (job_title) {
-      PMPrintSettings printSettings =
-          (PMPrintSettings)[printInfo PMPrintSettings];
-      PMPrintSettingsSetJobName(printSettings, (CFStringRef)job_title);
-      [printInfo updateFromPMPrintSettings];
-    }
-  }
+  if (parent_view)
+    UpdatePrintInfoWithJobName(printInfo, [[parent_view window] title]);
 
   // TODO(stuartmorgan): We really want a tab sheet here, not a modal window.
   // Will require restructuring the PrintingContext API to use a callback.
   NSInteger selection = [panel runModalWithPrintInfo:printInfo];
   if (selection == NSOKButton) {
     ParsePrintInfo([panel printInfo]);
     callback->Run(OK);
   } else {
     callback->Run(CANCEL);
   }
@@ skipping 22 matching lines @@
     return OnError();
   settings_.SetOrientation(landscape);
 
   std::string printer_name;
   if (!job_settings.GetString(kSettingPrinterName, &printer_name))
     return OnError();
 
   if (!SetPrinter(printer_name))
     return OnError();
 
+  string16 job_name;
+  if (!job_settings.GetString(kSettingPrintJobTitle, &job_name))
+    return OnError();

[stuartmorgan, 2011/03/30 22:59:17]

It's not clear to me that not having/setting a job name should be a fatal error.

+
+  if (!SetPrintJobName(job_name))
+    return OnError();
+
   InitPrintSettingsFromPrintInfo(ranges);
   return OK;
 }
 
 void PrintingContextMac::InitPrintSettingsFromPrintInfo(
     const PageRanges& ranges) {
   PMPrintSession print_session =
       static_cast<PMPrintSession>([print_info_.get() PMPrintSession]);
   PMPageFormat page_format =
       static_cast<PMPageFormat>([print_info_.get() PMPageFormat]);
@@ skipping 11 matching lines @@
   if (![[[print_info_.get() printer] name] isEqualToString:new_printer_name]) {
     NSPrinter* new_printer = [NSPrinter printerWithName:new_printer_name];
     if (new_printer == nil)
       return false;
 
     [print_info_.get() setPrinter:new_printer];
   }
   return true;
 }
 
+bool PrintingContextMac::SetPrintJobName(const string16& job_name) {
+    NSString* print_job_name = base::SysUTF16ToNSString(job_name);

[stuartmorgan, 2011/03/30 22:59:17]

Indentation is wrong here.

+  if (!print_job_name)
+    return false;
+  UpdatePrintInfoWithJobName(print_info_.get(), print_job_name);
+  return true;
+}
+
+void PrintingContextMac::UpdatePrintInfoWithJobName(
+    NSPrintInfo* printInfo, NSString* job_name) {
+  if (job_name) {

[stuartmorgan, 2011/03/30 22:59:17]

Change to
  if (!job_name)
    return;
so the core logic isn't indented.

+    PMPrintSettings settings = (PMPrintSettings)[printInfo PMPrintSettings];
+    PMPrintSettingsSetJobName(settings, (CFStringRef)job_name);
+    [printInfo updateFromPMPrintSettings];
+  }
+}
+
 void PrintingContextMac::ParsePrintInfo(NSPrintInfo* print_info) {
   ResetSettings();
   print_info_.reset([print_info retain]);
   PageRanges page_ranges;
   NSDictionary* print_info_dict = [print_info_.get() dictionary];
   if (![[print_info_dict objectForKey:NSPrintAllPages] boolValue]) {
     PageRange range;
     range.from = [[print_info_dict objectForKey:NSPrintFirstPage] intValue] - 1;
     range.to = [[print_info_dict objectForKey:NSPrintLastPage] intValue] - 1;
     page_ranges.push_back(range);
@@ skipping 103 matching lines @@
 void PrintingContextMac::ReleaseContext() {
   print_info_.reset();
   context_ = NULL;
 }
 
 gfx::NativeDrawingContext PrintingContextMac::context() const {
   return context_;
 }
 
 }  // namespace printing