diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
| commit | fd85ad650d68309b965dbc9f3d6823cf2754349c (patch) | |
| tree | 28b98629e02b2e05ec74272146f249ca62a164da /chrome/gpu | |
| parent | ce072a7181ea5d58133e33654133236f5d9f5551 (diff) | |
| download | chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.zip chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.gz chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.bz2 | |
Move app/win_util to app/win and fix the namespace usage.
Split out the two classes: ScopedComInitializer and ScopedCOMem (which I renamed) to separate files.
I removed the win_util_path file which had one function in it and moved the function to win_util.
Somehow, this was getting picked up by the nacl64 build and the call in sandbox_policy was then not being
defined. I just implemented the function in-plcae since it's just a simple wrapper around a Windows API call.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6013009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
| -rw-r--r-- | chrome/gpu/gpu_main.cc | 9 | ||||
| -rw-r--r-- | chrome/gpu/gpu_thread.cc | 7 |
2 files changed, 4 insertions, 12 deletions
diff --git a/chrome/gpu/gpu_main.cc b/chrome/gpu/gpu_main.cc index 5c8f27f..5d0e090 100644 --- a/chrome/gpu/gpu_main.cc +++ b/chrome/gpu/gpu_main.cc @@ -7,6 +7,7 @@ #include "app/app_switches.h" #include "app/gfx/gl/gl_context.h" #include "app/gfx/gl/gl_implementation.h" +#include "app/win/scoped_com_initializer.h" #include "base/environment.h" #include "base/message_loop.h" #include "base/stringprintf.h" @@ -30,10 +31,6 @@ #include "chrome/common/sandbox_mac.h" #endif -#if defined(OS_WIN) -#include "app/win_util.h" -#endif - #if defined(USE_X11) #include "gfx/gtk_util.h" #endif @@ -77,9 +74,7 @@ int GpuMain(const MainFunctionParams& parameters) { MessageLoop main_message_loop(MessageLoop::TYPE_UI); base::PlatformThread::SetName("CrGpuMain"); -#if defined(OS_WIN) - win_util::ScopedCOMInitializer com_initializer; -#endif + app::win::ScopedCOMInitializer com_initializer; #if defined(USE_X11) // The X11 port of the command buffer code assumes it can access the X diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc index 0c64e89..c72de9e 100644 --- a/chrome/gpu/gpu_thread.cc +++ b/chrome/gpu/gpu_thread.cc @@ -8,6 +8,7 @@ #include <vector> #include "app/gfx/gl/gl_context.h" +#include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" @@ -17,10 +18,6 @@ #include "chrome/gpu/gpu_info_collector.h" #include "ipc/ipc_channel_handle.h" -#if defined(OS_WIN) -#include "app/win_util.h" -#endif - GpuThread::GpuThread() { } @@ -159,7 +156,7 @@ void GpuThread::OnHang() { // Runs on a worker thread. The GpuThread never terminates voluntarily so it is // safe to assume that its message loop is valid. void GpuThread::CollectDxDiagnostics(GpuThread* thread) { - win_util::ScopedCOMInitializer com_initializer; + app::win::ScopedCOMInitializer com_initializer; DxDiagNode node; gpu_info_collector::GetDxDiagnostics(&node); |