| OLD | NEW |
| 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" | 10 #include "base/lock.h" |
| 11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
| 12 #include "base/thread.h" | 12 #include "base/threading/thread.h" |
| 13 #include "chrome/browser/browser_thread.h" | 13 #include "chrome/browser/browser_thread.h" |
| 14 | 14 |
| 15 class BrowserWebKitClientImpl; | 15 class BrowserWebKitClientImpl; |
| 16 | 16 |
| 17 // This creates a WebKit main thread on instantiation (if not in | 17 // This creates a WebKit main thread on instantiation (if not in |
| 18 // --single-process mode) on construction and kills it on deletion. | 18 // --single-process mode) on construction and kills it on deletion. |
| 19 class WebKitThread { | 19 class WebKitThread { |
| 20 public: | 20 public: |
| 21 // Called from the UI thread. | 21 // Called from the UI thread. |
| 22 WebKitThread(); | 22 WebKitThread(); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 39 scoped_ptr<BrowserWebKitClientImpl> webkit_client_; | 39 scoped_ptr<BrowserWebKitClientImpl> webkit_client_; |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 // Pointer to the actual WebKitThread. | 42 // Pointer to the actual WebKitThread. |
| 43 scoped_ptr<InternalWebKitThread> webkit_thread_; | 43 scoped_ptr<InternalWebKitThread> webkit_thread_; |
| 44 | 44 |
| 45 DISALLOW_COPY_AND_ASSIGN(WebKitThread); | 45 DISALLOW_COPY_AND_ASSIGN(WebKitThread); |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ | 48 #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ |
| OLD | NEW |