Cleanup: Fix some misc nits in printing code.

chrome/browser/printing/print_preview_message_handler.cc

 // Copyright (c) 2012 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 "chrome/browser/printing/print_preview_message_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "printing/page_size_margins.h"
 #include "printing/print_job_constants.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(printing::PrintPreviewMessageHandler);
 
+namespace printing {
+
 namespace {
 
 void StopWorker(int document_cookie) {
   if (document_cookie <= 0)
     return;
-  scoped_refptr<printing::PrintQueriesQueue> queue =
+  scoped_refptr<PrintQueriesQueue> queue =
       g_browser_process->print_job_manager()->queue();
-  scoped_refptr<printing::PrinterQuery> printer_query =
+  scoped_refptr<PrinterQuery> printer_query =
       queue->PopPrinterQuery(document_cookie);
   if (printer_query.get()) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(&printing::PrinterQuery::StopWorker,
+                            base::Bind(&PrinterQuery::StopWorker,
                                        printer_query));
   }
 }
 
 base::RefCountedBytes* GetDataFromHandle(base::SharedMemoryHandle handle,
-                                         uint32 data_size) {
+                                         uint32_t data_size) {
   scoped_ptr<base::SharedMemory> shared_buf(
       new base::SharedMemory(handle, true));
   if (!shared_buf->Map(data_size)) {
     NOTREACHED();
-    return NULL;
+    return nullptr;
   }
 
   unsigned char* data_begin = static_cast<unsigned char*>(shared_buf->memory());
   std::vector<unsigned char> data(data_begin, data_begin + data_size);
   return base::RefCountedBytes::TakeVector(&data);
 }
 
 }  // namespace
 
-namespace printing {
-
 PrintPreviewMessageHandler::PrintPreviewMessageHandler(
     WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
 
 PrintPreviewMessageHandler::~PrintPreviewMessageHandler() {
 }
 
 WebContents* PrintPreviewMessageHandler::GetPrintPreviewDialog() {
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
   if (!dialog_controller)
-    return NULL;
+    return nullptr;
   return dialog_controller->GetPrintPreviewForContents(web_contents());
 }
 
 PrintPreviewUI* PrintPreviewMessageHandler::GetPrintPreviewUI() {
   WebContents* dialog = GetPrintPreviewDialog();
   if (!dialog || !dialog->GetWebUI())
-    return NULL;
+    return nullptr;
   return static_cast<PrintPreviewUI*>(dialog->GetWebUI()->GetController());
 }
 
 void PrintPreviewMessageHandler::OnRequestPrintPreview(
     const PrintHostMsg_RequestPrintPreview_Params& params) {
-  if (params.webnode_only) {
-    printing::PrintViewManager::FromWebContents(web_contents())->
-        PrintPreviewForWebNode();
-  }
+  if (params.webnode_only)
+    PrintViewManager::FromWebContents(web_contents())->PrintPreviewForWebNode();
   PrintPreviewDialogController::PrintPreview(web_contents());
   PrintPreviewUI::SetInitialParams(GetPrintPreviewDialog(), params);
 }
 
 void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(
     const PrintHostMsg_DidGetPreviewPageCount_Params& params) {
   if (params.page_count <= 0) {
     NOTREACHED();
     return;
   }
@@ skipping 117 matching lines @@
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewInvalidPrinterSettings,
                         OnInvalidPrinterSettings)
     IPC_MESSAGE_HANDLER(PrintHostMsg_SetOptionsFromDocument,
                         OnSetOptionsFromDocument)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 }  // namespace printing