chrome/browser/host_zoom_map.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/host_zoom_map.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/host_zoom_map.h

diff --git a/chrome/browser/host_zoom_map.h b/chrome/browser/host_zoom_map.h

index 6030f4cc53cb1f68db5d74526d2ce6fdef2d8ed6..85e02edcd0a78759285b697aae2160ac7f630947 100644

--- a/chrome/browser/host_zoom_map.h

+++ b/chrome/browser/host_zoom_map.h

@@ -14,8 +14,8 @@

#include <vector>

#include "base/basictypes.h"

-#include "base/lock.h"

#include "base/ref_counted.h"

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

#include "chrome/browser/browser_thread.h"

#include "chrome/browser/prefs/pref_change_registrar.h"

#include "chrome/common/notification_observer.h"

@@ -112,7 +112,7 @@ class HostZoomMap :

// Used around accesses to |host_zoom_levels_|, |default_zoom_level_| and

// |temporary_zoom_levels_| to guarantee thread safety.

- mutable Lock lock_;

+ mutable base::Lock lock_;

// Whether we are currently updating preferences, this is used to ignore

// notifications from the preference service that we triggered ourself.

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