Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5767)

Unified Diff: chrome/browser/printing/print_dialog_gtk.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/printing/print_dialog_cloud_internal.h ('k') | chrome/browser/printing/print_job_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « chrome/browser/printing/print_dialog_cloud_internal.h ('k') | chrome/browser/printing/print_job_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698