| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ | 5 #ifndef CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |
| 6 #define CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ | 6 #define CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "content/child/child_thread_impl.h" | 13 #include "content/child/child_thread_impl.h" |
| 14 #include "content/common/content_export.h" | 14 #include "content/common/content_export.h" |
| 15 #include "content/public/utility/utility_thread.h" | 15 #include "content/public/utility/utility_thread.h" |
| 16 | 16 |
| 17 namespace base { | 17 namespace base { |
| 18 class FilePath; | 18 class FilePath; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace content { | 21 namespace content { |
| 22 class BlinkPlatformImpl; | 22 class BlinkPlatformImpl; |
| 23 class UtilityBlinkPlatformImpl; |
| 23 | 24 |
| 24 #if defined(COMPILER_MSVC) | 25 #if defined(COMPILER_MSVC) |
| 25 // See explanation for other RenderViewHostImpl which is the same issue. | 26 // See explanation for other RenderViewHostImpl which is the same issue. |
| 26 #pragma warning(push) | 27 #pragma warning(push) |
| 27 #pragma warning(disable: 4250) | 28 #pragma warning(disable: 4250) |
| 28 #endif | 29 #endif |
| 29 | 30 |
| 30 // This class represents the background thread where the utility task runs. | 31 // This class represents the background thread where the utility task runs. |
| 31 class UtilityThreadImpl : public UtilityThread, | 32 class UtilityThreadImpl : public UtilityThread, |
| 32 public ChildThreadImpl { | 33 public ChildThreadImpl { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 49 void OnBatchModeStarted(); | 50 void OnBatchModeStarted(); |
| 50 void OnBatchModeFinished(); | 51 void OnBatchModeFinished(); |
| 51 | 52 |
| 52 #if defined(OS_POSIX) && defined(ENABLE_PLUGINS) | 53 #if defined(OS_POSIX) && defined(ENABLE_PLUGINS) |
| 53 void OnLoadPlugins(const std::vector<base::FilePath>& plugin_paths); | 54 void OnLoadPlugins(const std::vector<base::FilePath>& plugin_paths); |
| 54 #endif | 55 #endif |
| 55 | 56 |
| 56 // True when we're running in batch mode. | 57 // True when we're running in batch mode. |
| 57 bool batch_mode_; | 58 bool batch_mode_; |
| 58 | 59 |
| 59 scoped_ptr<BlinkPlatformImpl> blink_platform_impl_; | 60 scoped_ptr<UtilityBlinkPlatformImpl> blink_platform_impl_; |
| 60 | 61 |
| 61 DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl); | 62 DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl); |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 #if defined(COMPILER_MSVC) | 65 #if defined(COMPILER_MSVC) |
| 65 #pragma warning(pop) | 66 #pragma warning(pop) |
| 66 #endif | 67 #endif |
| 67 | 68 |
| 68 } // namespace content | 69 } // namespace content |
| 69 | 70 |
| 70 #endif // CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ | 71 #endif // CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |
| OLD | NEW |