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

Side by Side Diff: chrome/browser/in_process_webkit/webkit_thread.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 | « chrome/browser/host_zoom_map.cc ('k') | chrome/browser/mach_broker_mac.h » ('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 CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ 5 #ifndef CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_
6 #define CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ 6 #define CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/lock.h"
11 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
12 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
13 #include "chrome/browser/browser_thread.h" 12 #include "chrome/browser/browser_thread.h"
14 13
15 class BrowserWebKitClientImpl; 14 class BrowserWebKitClientImpl;
16 15
17 // This creates a WebKit main thread on instantiation (if not in 16 // This creates a WebKit main thread on instantiation (if not in
18 // --single-process mode) on construction and kills it on deletion. 17 // --single-process mode) on construction and kills it on deletion.
19 class WebKitThread { 18 class WebKitThread {
20 public: 19 public:
(...skipping 18 matching lines...) Expand all
39 scoped_ptr<BrowserWebKitClientImpl> webkit_client_; 38 scoped_ptr<BrowserWebKitClientImpl> webkit_client_;
40 }; 39 };
41 40
42 // Pointer to the actual WebKitThread. 41 // Pointer to the actual WebKitThread.
43 scoped_ptr<InternalWebKitThread> webkit_thread_; 42 scoped_ptr<InternalWebKitThread> webkit_thread_;
44 43
45 DISALLOW_COPY_AND_ASSIGN(WebKitThread); 44 DISALLOW_COPY_AND_ASSIGN(WebKitThread);
46 }; 45 };
47 46
48 #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ 47 #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_
OLDNEW
« no previous file with comments | « chrome/browser/host_zoom_map.cc ('k') | chrome/browser/mach_broker_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698