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

Side by Side Diff: printing/printed_document.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « printing/backend/print_backend_cups.cc ('k') | printing/printed_document.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PRINTING_PRINTED_DOCUMENT_H_ 5 #ifndef PRINTING_PRINTED_DOCUMENT_H_
6 #define PRINTING_PRINTED_DOCUMENT_H_ 6 #define PRINTING_PRINTED_DOCUMENT_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/lock.h"
11 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
12 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
13 #include "base/string16.h" 12 #include "base/string16.h"
13 #include "base/synchronization/lock.h"
14 #include "gfx/native_widget_types.h" 14 #include "gfx/native_widget_types.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 #include "printing/print_settings.h" 16 #include "printing/print_settings.h"
17 #include "printing/native_metafile.h" 17 #include "printing/native_metafile.h"
18 18
19 class FilePath; 19 class FilePath;
20 class MessageLoop; 20 class MessageLoop;
21 21
22 namespace gfx { 22 namespace gfx {
23 class Font; 23 class Font;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 // header or footer itself. 187 // header or footer itself.
188 // TODO(jhawkins): string16. 188 // TODO(jhawkins): string16.
189 void DrawHeaderFooter(gfx::NativeDrawingContext context, 189 void DrawHeaderFooter(gfx::NativeDrawingContext context,
190 std::wstring text, 190 std::wstring text,
191 gfx::Rect bounds) const; 191 gfx::Rect bounds) const;
192 192
193 void DebugDump(const PrintedPage& page); 193 void DebugDump(const PrintedPage& page);
194 194
195 // All writable data member access must be guarded by this lock. Needs to be 195 // All writable data member access must be guarded by this lock. Needs to be
196 // mutable since it can be acquired from const member functions. 196 // mutable since it can be acquired from const member functions.
197 mutable Lock lock_; 197 mutable base::Lock lock_;
198 198
199 // All the mutable members. 199 // All the mutable members.
200 Mutable mutable_; 200 Mutable mutable_;
201 201
202 // All the immutable members. 202 // All the immutable members.
203 const Immutable immutable_; 203 const Immutable immutable_;
204 204
205 DISALLOW_COPY_AND_ASSIGN(PrintedDocument); 205 DISALLOW_COPY_AND_ASSIGN(PrintedDocument);
206 }; 206 };
207 207
208 } // namespace printing 208 } // namespace printing
209 209
210 #endif // PRINTING_PRINTED_DOCUMENT_H_ 210 #endif // PRINTING_PRINTED_DOCUMENT_H_
OLDNEW
« no previous file with comments | « printing/backend/print_backend_cups.cc ('k') | printing/printed_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698