diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
commit | 176aa48371da91eb98d675d87b4e70c7b26d696f (patch) | |
tree | 4c972de6ecd5a54650ab1dc7d421187f5d25834f /base/clipboard_win.cc | |
parent | 9a3f0ac2899139ace97e399015259d028b4d5704 (diff) | |
download | chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.zip chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.gz chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.bz2 |
Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.
Move Process and SharedMemory into the base namespace (most changes).
Review URL: http://codereview.chromium.org/10895
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/clipboard_win.cc')
-rw-r--r-- | base/clipboard_win.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/base/clipboard_win.cc b/base/clipboard_win.cc index affb520..814065d 100644 --- a/base/clipboard_win.cc +++ b/base/clipboard_win.cc @@ -147,7 +147,8 @@ void Clipboard::WriteObjects(const ObjectMap& objects) { WriteObjects(objects, NULL); } -void Clipboard::WriteObjects(const ObjectMap& objects, ProcessHandle process) { +void Clipboard::WriteObjects(const ObjectMap& objects, + base::ProcessHandle process) { ScopedClipboard clipboard; if (!clipboard.Acquire(clipboard_owner_)) return; @@ -267,12 +268,12 @@ void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) { void Clipboard::WriteBitmapFromSharedMemory(const char* bitmap_data, const char* size_data, - ProcessHandle process) { - const SharedMemoryHandle* remote_bitmap_handle = - reinterpret_cast<const SharedMemoryHandle*>(bitmap_data); + base::ProcessHandle process) { + const base::SharedMemoryHandle* remote_bitmap_handle = + reinterpret_cast<const base::SharedMemoryHandle*>(bitmap_data); const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data); - SharedMemory bitmap(*remote_bitmap_handle, false, process); + base::SharedMemory bitmap(*remote_bitmap_handle, false, process); // TODO(darin): share data in gfx/bitmap_header.cc somehow BITMAPINFO bm_info = {0}; |