Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / printing / printing_message_filter.cc

diff --git a/src/chrome/browser/printing/printing_message_filter.cc b/src/chrome/browser/printing/printing_message_filter.cc
index 262ed79..421cf49 100644 (file)
--- a/src/chrome/browser/printing/printing_message_filter.cc
+++ b/src/chrome/browser/printing/printing_message_filter.cc
@@ -30,7 +30,6 @@
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
-#include "content/public/browser/web_contents_view.h"
 #endif
 
 #if defined(OS_ANDROID)
@@ -90,7 +89,8 @@ void RenderParamsFromPrintSettings(const printing::PrintSettings& settings,
 
 PrintingMessageFilter::PrintingMessageFilter(int render_process_id,
                                              Profile* profile)
-    : profile_io_data_(ProfileIOData::FromResourceContext(
+    : BrowserMessageFilter(PrintMsgStart),
+      profile_io_data_(ProfileIOData::FromResourceContext(
           profile->GetResourceContext())),
       render_process_id_(render_process_id),
       queue_(g_browser_process->print_job_manager()->queue()) {
@@ -160,7 +160,7 @@ void PrintingMessageFilter::OnAllocateTempFileForPrinting(
     int* sequence_number) {
 #if defined(OS_CHROMEOS)
   // TODO(thestig): Use |render_view_id| for Chrome OS.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   temp_file_fd->fd = *sequence_number = -1;
   temp_file_fd->auto_close = false;
 
@@ -168,7 +168,7 @@ void PrintingMessageFilter::OnAllocateTempFileForPrinting(
   *sequence_number = g_printing_file_descriptor_map.Get().sequence++;
 
   base::FilePath path;
-  if (file_util::CreateTemporaryFile(&path)) {
+  if (base::CreateTemporaryFile(&path)) {
     int fd = open(path.value().c_str(), O_WRONLY);
     if (fd >= 0) {
       SequenceToPathMap::iterator it = map->find(*sequence_number);
@@ -183,7 +183,7 @@ void PrintingMessageFilter::OnAllocateTempFileForPrinting(
     }
   }
 #elif defined(OS_ANDROID)
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::WebContents* wc = GetWebContentsForRenderView(render_view_id);
   if (!wc)
     return;
@@ -201,7 +201,7 @@ void PrintingMessageFilter::OnAllocateTempFileForPrinting(
 void PrintingMessageFilter::OnTempFileForPrintingWritten(int render_view_id,
                                                          int sequence_number) {
 #if defined(OS_CHROMEOS)
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   SequenceToPathMap* map = &g_printing_file_descriptor_map.Get().map;
   SequenceToPathMap::iterator it = map->find(sequence_number);
   if (it == map->end()) {
@@ -217,7 +217,7 @@ void PrintingMessageFilter::OnTempFileForPrintingWritten(int render_view_id,
   // Erase the entry in the map.
   map->erase(it);
 #elif defined(OS_ANDROID)
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::WebContents* wc = GetWebContentsForRenderView(render_view_id);
   if (!wc)
     return;
@@ -241,18 +241,17 @@ void PrintingMessageFilter::CreatePrintDialogForFile(
     return;
   print_dialog_cloud::CreatePrintDialogForFile(
       wc->GetBrowserContext(),
-      wc->GetView()->GetTopLevelNativeWindow(),
+      wc->GetTopLevelNativeWindow(),
       path,
       wc->GetTitle(),
-      string16(),
-      std::string("application/pdf"),
-      false);
+      base::string16(),
+      std::string("application/pdf"));
 }
 #endif  // defined(OS_CHROMEOS)
 
 content::WebContents* PrintingMessageFilter::GetWebContentsForRenderView(
     int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::RenderViewHost* view = content::RenderViewHost::FromID(
       render_process_id_, render_view_id);
   return view ? content::WebContents::FromRenderViewHost(view) : NULL;
@@ -270,7 +269,7 @@ void PrintingMessageFilter::GetPrintSettingsForRenderView(
     GetPrintSettingsForRenderViewParams params,
     const base::Closure& callback,
     scoped_refptr<printing::PrinterQuery> printer_query) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::WebContents* wc = GetWebContentsForRenderView(render_view_id);
   if (wc) {
     scoped_ptr<PrintingUIWebContentsObserver> wc_observer(
@@ -292,19 +291,19 @@ void PrintingMessageFilter::GetPrintSettingsForRenderView(
 void PrintingMessageFilter::OnGetPrintSettingsFailed(
     const base::Closure& callback,
     scoped_refptr<printing::PrinterQuery> printer_query) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   printer_query->GetSettingsDone(printing::PrintSettings(),
                                  printing::PrintingContext::FAILED);
   callback.Run();
 }
 
 void PrintingMessageFilter::OnIsPrintingEnabled(bool* is_enabled) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   *is_enabled = profile_io_data_->printing_enabled()->GetValue();
 }
 
 void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   scoped_refptr<printing::PrinterQuery> printer_query;
   if (!profile_io_data_->printing_enabled()->GetValue()) {
     // Reply with NULL query.
@@ -400,7 +399,7 @@ void PrintingMessageFilter::OnScriptedPrintReply(
   if (params.params.dpi && params.params.document_cookie) {
 #if defined(OS_ANDROID)
     int file_descriptor;
-    const string16& device_name = printer_query->settings().device_name();
+    const base::string16& device_name = printer_query->settings().device_name();
     if (base::StringToInt(device_name, &file_descriptor)) {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
@@ -416,7 +415,7 @@ void PrintingMessageFilter::OnScriptedPrintReply(
 
 #if defined(OS_ANDROID)
 void PrintingMessageFilter::UpdateFileDescriptor(int render_view_id, int fd) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::WebContents* wc = GetWebContentsForRenderView(render_view_id);
   if (!wc)
     return;
@@ -427,7 +426,7 @@ void PrintingMessageFilter::UpdateFileDescriptor(int render_view_id, int fd) {
 #endif
 
 void PrintingMessageFilter::OnUpdatePrintSettings(
-    int document_cookie, const DictionaryValue& job_settings,
+    int document_cookie, const base::DictionaryValue& job_settings,
     IPC::Message* reply_msg) {
   scoped_refptr<printing::PrinterQuery> printer_query;
   if (!profile_io_data_->printing_enabled()->GetValue()) {