| Index: chrome/browser/profiles/profile.h
|
| diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
|
| index a1374bd87236c8afcda5d228efc0fab7d6fe3ac3..a18b9dafc9bb0d3e9a9eded052d93a0fe42fa4cd 100644
|
| --- a/chrome/browser/profiles/profile.h
|
| +++ b/chrome/browser/profiles/profile.h
|
| @@ -32,7 +32,6 @@ class PrefService;
|
| class PromoCounter;
|
| class ProtocolHandlerRegistry;
|
| class TestingProfile;
|
| -class UserScriptMaster;
|
| class VisitedLinkMaster;
|
| class WebDataService;
|
|
|
| @@ -53,11 +52,14 @@ class LibCrosServiceLibraryImpl;
|
| class ResetDefaultProxyConfigServiceTask;
|
| }
|
|
|
| -
|
| namespace content {
|
| class WebUI;
|
| }
|
|
|
| +namespace extensions {
|
| +class UserScriptMaster;
|
| +}
|
| +
|
| namespace fileapi {
|
| class FileSystemContext;
|
| }
|
| @@ -199,11 +201,11 @@ class Profile : public content::BrowserContext {
|
| virtual ExtensionService* GetExtensionService() = 0;
|
|
|
| // DEPRECATED. Instead, use ExtensionSystem::user_script_master().
|
| - // Retrieves a pointer to the UserScriptMaster associated with this
|
| - // profile. The UserScriptMaster is lazily created the first time
|
| - // that this method is called.
|
| + // Retrieves a pointer to the extensions::UserScriptMaster associated with
|
| + // this profile. The extensions::UserScriptMaster is lazily created the first
|
| + // time that this method is called.
|
| // TODO(yoz): remove this accessor (bug 104095).
|
| - virtual UserScriptMaster* GetUserScriptMaster() = 0;
|
| + virtual extensions::UserScriptMaster* GetUserScriptMaster() = 0;
|
|
|
| // DEPRECATED. Instead, use ExtensionSystem::process_manager().
|
| // Retrieves a pointer to the ExtensionProcessManager associated with this
|
|
|