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/plugin | |
| 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/plugin')
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 498df98..1d7a077 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -6,14 +6,7 @@ #include "build/build_config.h" -#if defined(OS_WIN) -#include "app/win_util.h" -#endif #include "base/lazy_instance.h" -#if defined(OS_MACOSX) -#include "base/mac_util.h" -#include "base/mac/scoped_cftyperef.h" -#endif #include "base/scoped_handle.h" #include "base/shared_memory.h" #include "build/build_config.h" @@ -24,17 +17,22 @@ #include "chrome/plugin/npobject_util.h" #include "chrome/plugin/plugin_channel.h" #include "chrome/plugin/plugin_thread.h" +#include "gfx/blit.h" +#include "gfx/canvas.h" +#include "skia/ext/platform_device.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "webkit/plugins/npapi/webplugin_delegate_impl.h" + #if defined(OS_MACOSX) +#include "base/mac_util.h" +#include "base/mac/scoped_cftyperef.h" #include "chrome/plugin/webplugin_accelerated_surface_proxy_mac.h" #endif -#include "gfx/blit.h" -#include "gfx/canvas.h" + #if defined(OS_WIN) +#include "app/win/win_util.h" #include "gfx/gdi_util.h" #endif -#include "skia/ext/platform_device.h" -#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #if defined(USE_X11) #include "app/x11_util_internal.h" @@ -538,7 +536,7 @@ void WebPluginProxy::SetWindowlessBuffer( window_rect.width(), window_rect.height(), true, - win_util::GetSectionFromProcess(windowless_buffer, + app::win::GetSectionFromProcess(windowless_buffer, channel_->renderer_handle(), false))) { windowless_canvas_.reset(); background_canvas_.reset(); @@ -551,7 +549,7 @@ void WebPluginProxy::SetWindowlessBuffer( window_rect.width(), window_rect.height(), true, - win_util::GetSectionFromProcess(background_buffer, + app::win::GetSectionFromProcess(background_buffer, channel_->renderer_handle(), false))) { windowless_canvas_.reset(); background_canvas_.reset(); |