| Index: chrome/renderer/extensions/extension_dispatcher.h
|
| diff --git a/chrome/renderer/extensions/extension_dispatcher.h b/chrome/renderer/extensions/extension_dispatcher.h
|
| index f8ae6003f690471b1d5e66cdbf8b0901211d7017..5d158d3e0ef0fae8a6e890b89f07f6aa7be355ce 100644
|
| --- a/chrome/renderer/extensions/extension_dispatcher.h
|
| +++ b/chrome/renderer/extensions/extension_dispatcher.h
|
| @@ -25,11 +25,11 @@ class ExtensionRequestSender;
|
| class GURL;
|
| class ModuleSystem;
|
| class URLPattern;
|
| -class UserScriptSlave;
|
| struct ExtensionMsg_Loaded_Params;
|
|
|
| namespace extensions {
|
| class FilteredEventRouter;
|
| +class UserScriptSlave;
|
| }
|
|
|
| namespace WebKit {
|
| @@ -64,7 +64,9 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
|
| const ChromeV8ContextSet& v8_context_set() const {
|
| return v8_context_set_;
|
| }
|
| - UserScriptSlave* user_script_slave() { return user_script_slave_.get(); }
|
| + extensions::UserScriptSlave* user_script_slave() {
|
| + return user_script_slave_.get();
|
| + }
|
| extensions::V8SchemaRegistry* v8_schema_registry() {
|
| return &v8_schema_registry_;
|
| }
|
| @@ -222,7 +224,7 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
|
| // There is zero or one for each v8 context.
|
| ChromeV8ContextSet v8_context_set_;
|
|
|
| - scoped_ptr<UserScriptSlave> user_script_slave_;
|
| + scoped_ptr<extensions::UserScriptSlave> user_script_slave_;
|
|
|
| // Same as above, but on a longer timer and will run even if the process is
|
| // not idle, to ensure that IdleHandle gets called eventually.
|
|
|