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 /chrome/renderer/greasemonkey_slave.h | |
| 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 'chrome/renderer/greasemonkey_slave.h')
| -rw-r--r-- | chrome/renderer/greasemonkey_slave.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/greasemonkey_slave.h b/chrome/renderer/greasemonkey_slave.h index 5be3697..5f80f8b 100644 --- a/chrome/renderer/greasemonkey_slave.h +++ b/chrome/renderer/greasemonkey_slave.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 CHROME_RENDERER_GREASEMONKEY_SLAVE_H__ -#define CHROME_RENDERER_GREASEMONKEY_SLAVE_H__ +#ifndef CHROME_RENDERER_GREASEMONKEY_SLAVE_H_ +#define CHROME_RENDERER_GREASEMONKEY_SLAVE_H_ #include "base/scoped_ptr.h" #include "base/shared_memory.h" @@ -75,7 +75,7 @@ class GreasemonkeySlave { GreasemonkeySlave(); // Update the parsed scripts from shared memory. - bool UpdateScripts(SharedMemoryHandle shared_memory); + bool UpdateScripts(base::SharedMemoryHandle shared_memory); // Inject the appropriate scripts into a frame based on its URL. // TODO(aa): Extract a GreasemonkeyFrame interface out of this to improve @@ -84,7 +84,7 @@ class GreasemonkeySlave { private: // Shared memory containing raw script data. - scoped_ptr<SharedMemory> shared_memory_; + scoped_ptr<base::SharedMemory> shared_memory_; // Parsed script data. std::vector<GreasemonkeyScript> scripts_; @@ -92,4 +92,4 @@ class GreasemonkeySlave { DISALLOW_COPY_AND_ASSIGN(GreasemonkeySlave); }; -#endif // CHROME_RENDERER_GREASEMONKEY_SLAVE_H__ +#endif // CHROME_RENDERER_GREASEMONKEY_SLAVE_H_ |