chrome/browser/hang_monitor/hung_window_detector.h - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/hang_monitor/hung_window_detector.h

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

Index: chrome/browser/hang_monitor/hung_window_detector.h

diff --git a/chrome/browser/hang_monitor/hung_window_detector.h b/chrome/browser/hang_monitor/hung_window_detector.h

index 0e4873972eb9bc8c03306db542c6e1e54a0cea29..50ea31f0be9aeefb6cb8e4d745ef7bf7949d44cf 100644

--- a/chrome/browser/hang_monitor/hung_window_detector.h

+++ b/chrome/browser/hang_monitor/hung_window_detector.h

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_HANG_MONITOR_HUNG_WINDOW_DETECTOR_H__

#pragma once

-#include "base/lock.h"

+#include "base/synchronization/lock.h"

#include "chrome/common/worker_thread_ticker.h"

// This class provides the following functionality:

@@ -81,7 +81,7 @@ class HungWindowDetector : public WorkerThreadTicker::Callback {

// How long do we wait before we consider a window hung (in ms)

int message_response_timeout_;

- Lock hang_detection_lock_;

+ base::Lock hang_detection_lock_;

// Indicates if this object is currently enumerating hung windows

bool enumerating_;

« no previous file with comments | « chrome/browser/geolocation/wifi_data_provider_common.cc ('k') | chrome/browser/history/top_sites.h » ('j') | no next file with comments »