diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/chrome/browser/printing/printer_manager_dialog_win.cc | |
parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/printing/printer_manager_dialog_win.cc')
-rw-r--r-- | chromium/chrome/browser/printing/printer_manager_dialog_win.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/chrome/browser/printing/printer_manager_dialog_win.cc b/chromium/chrome/browser/printing/printer_manager_dialog_win.cc index 5e71976ebb1..983dea7ba64 100644 --- a/chromium/chrome/browser/printing/printer_manager_dialog_win.cc +++ b/chromium/chrome/browser/printing/printer_manager_dialog_win.cc @@ -10,31 +10,31 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/path_service.h" +#include "base/task_scheduler/post_task.h" #include "base/threading/thread.h" -#include "chrome/browser/browser_process.h" -#include "content/public/browser/browser_thread.h" -using content::BrowserThread; - -namespace printing { +namespace { // A helper callback that opens the printer management dialog. void OpenPrintersDialogCallback() { base::FilePath sys_dir; PathService::Get(base::DIR_SYSTEM, &sys_dir); - base::FilePath rundll32 = sys_dir.AppendASCII("rundll32.exe"); - base::FilePath shell32dll = sys_dir.AppendASCII("shell32.dll"); + base::FilePath rundll32 = sys_dir.Append(L"rundll32.exe"); + base::FilePath shell32dll = sys_dir.Append(L"shell32.dll"); std::wstring args(shell32dll.value()); args.append(L",SHHelpShortcuts_RunDLL PrintersFolder"); - ShellExecute(NULL, L"open", rundll32.value().c_str(), args.c_str(), NULL, - SW_SHOWNORMAL); + ShellExecute(nullptr, L"open", rundll32.value().c_str(), args.c_str(), + nullptr, SW_SHOWNORMAL); } +} // namespace + +namespace printing { + void PrinterManagerDialog::ShowPrinterManagerDialog() { - BrowserThread::PostTask( - BrowserThread::FILE, - FROM_HERE, + base::PostTaskWithTraits( + FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_BLOCKING}, base::Bind(OpenPrintersDialogCallback)); } |