| Index: chrome/renderer/extensions/user_script_slave.h
|
| diff --git a/chrome/renderer/extensions/user_script_slave.h b/chrome/renderer/extensions/user_script_slave.h
|
| index 8f4aa8708eff6013237d0ee0e6643931abab40c2..02b61cf73633bac76255c274343053810449c5bf 100644
|
| --- a/chrome/renderer/extensions/user_script_slave.h
|
| +++ b/chrome/renderer/extensions/user_script_slave.h
|
| @@ -20,16 +20,15 @@
|
| class ExtensionSet;
|
| class GURL;
|
|
|
| -namespace extensions {
|
| -class Extension;
|
| -}
|
| -
|
| namespace WebKit {
|
| class WebFrame;
|
| }
|
|
|
| using WebKit::WebScriptSource;
|
|
|
| +namespace extensions {
|
| +class Extension;
|
| +
|
| // Manages installed UserScripts for a render process.
|
| class UserScriptSlave {
|
| public:
|
| @@ -54,7 +53,7 @@ class UserScriptSlave {
|
| // Gets the isolated world ID to use for the given |extension| in the given
|
| // |frame|. If no isolated world has been created for that extension,
|
| // one will be created and initialized.
|
| - int GetIsolatedWorldIdForExtension(const extensions::Extension* extension,
|
| + int GetIsolatedWorldIdForExtension(const Extension* extension,
|
| WebKit::WebFrame* frame);
|
|
|
| // Gets the id of the extension running in a given isolated world. If no such
|
| @@ -66,7 +65,7 @@ class UserScriptSlave {
|
|
|
| private:
|
| static void InitializeIsolatedWorld(int isolated_world_id,
|
| - const extensions::Extension* extension);
|
| + const Extension* extension);
|
|
|
| // Shared memory containing raw script data.
|
| scoped_ptr<base::SharedMemory> shared_memory_;
|
| @@ -87,4 +86,6 @@ class UserScriptSlave {
|
| DISALLOW_COPY_AND_ASSIGN(UserScriptSlave);
|
| };
|
|
|
| +} // namespace extensions
|
| +
|
| #endif // CHROME_RENDERER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
|
|
|