| Index: chrome/browser/printing/print_dialog_gtk.cc
|
| diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
|
| index eac9bbe5d2c3d3601a6510ec26013fa2a293526d..88463165a00d5f22a92597bc6427e888126d7955 100644
|
| --- a/chrome/browser/printing/print_dialog_gtk.cc
|
| +++ b/chrome/browser/printing/print_dialog_gtk.cc
|
| @@ -11,8 +11,8 @@
|
| #include "base/file_util.h"
|
| #include "base/file_util_proxy.h"
|
| #include "base/lazy_instance.h"
|
| -#include "base/lock.h"
|
| #include "base/logging.h"
|
| +#include "base/synchronization/lock.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/browser_list.h"
|
| @@ -26,8 +26,8 @@ namespace {
|
| PrintDialogGtk* g_print_dialog = NULL;
|
|
|
| // Used to make accesses to the above thread safe.
|
| -Lock& DialogLock() {
|
| - static base::LazyInstance<Lock> dialog_lock(base::LINKER_INITIALIZED);
|
| +base::Lock& DialogLock() {
|
| + static base::LazyInstance<base::Lock> dialog_lock(base::LINKER_INITIALIZED);
|
| return dialog_lock.Get();
|
| }
|
|
|
| @@ -77,7 +77,7 @@ void PrintDialogGtk::CreatePrintDialogForPdf(const FilePath& path) {
|
|
|
| // static
|
| bool PrintDialogGtk::DialogShowing() {
|
| - AutoLock lock(DialogLock());
|
| + base::AutoLock lock(DialogLock());
|
| return !!g_print_dialog;
|
| }
|
|
|
| @@ -87,7 +87,7 @@ void PrintDialogGtk::CreateDialogImpl(const FilePath& path) {
|
| // locking up the system with
|
| //
|
| // while(true){print();}
|
| - AutoLock lock(DialogLock());
|
| + base::AutoLock lock(DialogLock());
|
| if (g_print_dialog)
|
| return;
|
|
|
| @@ -107,7 +107,7 @@ PrintDialogGtk::PrintDialogGtk(const FilePath& path_to_pdf)
|
| }
|
|
|
| PrintDialogGtk::~PrintDialogGtk() {
|
| - AutoLock lock(DialogLock());
|
| + base::AutoLock lock(DialogLock());
|
| DCHECK_EQ(this, g_print_dialog);
|
| g_print_dialog = NULL;
|
| }
|
|
|