diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
| commit | dcd5776135982012e99ea7b7030b3412f61235c7 (patch) | |
| tree | 2853a787d4c09e4a8417a0c74a312917a05dce08 /content/gpu | |
| parent | 05ba8b8dd541632486513221795d45e4fe71b47f (diff) | |
| download | chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.zip chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.gz chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.bz2 | |
Reland "Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories."
The issue with the r90464 was that in the win shared build we build dlls and we
need BASE_API to export functions and symbols.
BUG=72317
TEST=None
TBR=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7263009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_main.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index ec62d13..62336cc 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) { - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; DxDiagNode node; gpu_info_collector::GetDxDiagnostics(&node); diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 422175c..cea11e6 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -8,11 +8,11 @@ #include <windows.h> #endif -#include "app/win/scoped_com_initializer.h" #include "base/environment.h" #include "base/message_loop.h" #include "base/stringprintf.h" #include "base/threading/platform_thread.h" +#include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/content_switches.h" #include "content/common/gpu/gpu_config.h" @@ -57,7 +57,7 @@ int GpuMain(const MainFunctionParams& parameters) { #endif } - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; // We can not tolerate early returns from this code, because the // detection of early return of a child process is implemented using |