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 /webkit/glue | |
| 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 'webkit/glue')
| -rw-r--r-- | webkit/glue/resource_handle_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/scoped_clipboard_writer_glue.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc index a7d72a7..37528d6 100644 --- a/webkit/glue/resource_handle_impl.cc +++ b/webkit/glue/resource_handle_impl.cc @@ -402,7 +402,7 @@ bool ResourceHandleInternal::Start( // have a origin_pid. Find a better place to set this. int origin_pid = request_.originPid(); if (origin_pid == 0) - origin_pid = process_util::GetCurrentProcId(); + origin_pid = base::GetCurrentProcId(); bool mixed_content = webkit_glue::KURLToGURL(request_.mainDocumentURL()).SchemeIsSecure() && diff --git a/webkit/glue/scoped_clipboard_writer_glue.h b/webkit/glue/scoped_clipboard_writer_glue.h index 5a3ecb5..6307e6a 100644 --- a/webkit/glue/scoped_clipboard_writer_glue.h +++ b/webkit/glue/scoped_clipboard_writer_glue.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SCOPED_CLIPBOARD_WRITER_GLUE_H__ -#define SCOPED_CLIPBOARD_WRITER_GLUE_H__ +#ifndef SCOPED_CLIPBOARD_WRITER_GLUE_H_ +#define SCOPED_CLIPBOARD_WRITER_GLUE_H_ #include "base/clipboard.h" #include "base/scoped_clipboard_writer.h" @@ -22,8 +22,8 @@ class ScopedClipboardWriterGlue : public ScopedClipboardWriter { #endif private: - SharedMemory* shared_buf_; + base::SharedMemory* shared_buf_; DISALLOW_COPY_AND_ASSIGN(ScopedClipboardWriterGlue); }; -#endif // SCOPED_CLIPBOARD_WRITER_GLUE_H__ +#endif // SCOPED_CLIPBOARD_WRITER_GLUE_H_ |