diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 01:38:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 01:38:59 +0000 |
| commit | 541434c24710c131b697cf461fc3a21ddb74ed39 (patch) | |
| tree | c9c445ea4d5e2c95a7f5dd3fc3cd04078f9b3545 /content/gpu/gpu_child_thread.cc | |
| parent | 60d2744cf0fbc02b5255407a6d03abb21a264dc5 (diff) | |
| download | chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.zip chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.tar.gz chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.tar.bz2 | |
Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories.
BUG=72317
TEST=None
R=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7231016
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/7265009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_child_thread.cc')
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 62336cc..ec62d13 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -7,9 +7,9 @@ #include <string> #include <vector> +#include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/threading/worker_pool.h" -#include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/content_client.h" @@ -259,7 +259,7 @@ void GpuChildThread::OnHang() { // Runs on a worker thread. The GPU process never terminates voluntarily so // it is safe to assume that its message loop is valid. void GpuChildThread::CollectDxDiagnostics(GpuChildThread* thread) { - base::win::ScopedCOMInitializer com_initializer; + app::win::ScopedCOMInitializer com_initializer; DxDiagNode node; gpu_info_collector::GetDxDiagnostics(&node); |