| Index: chrome/browser/extensions/user_script_master.h
|
| diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
|
| index 76f01fd602ac0aac7776b06006f97969fc49c2ee..ddcc1f5bdca49c66dbb63d30a0c20c594c615cbc 100644
|
| --- a/chrome/browser/extensions/user_script_master.h
|
| +++ b/chrome/browser/extensions/user_script_master.h
|
| @@ -15,10 +15,10 @@
|
| #include "base/memory/shared_memory.h"
|
| #include "base/strings/string_piece.h"
|
| #include "chrome/common/extensions/extension_messages.h"
|
| -#include "chrome/common/extensions/extension_set.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| +#include "extensions/common/extension_set.h"
|
| #include "extensions/common/user_script.h"
|
|
|
| namespace content {
|
| @@ -27,11 +27,11 @@ class RenderProcessHost;
|
|
|
| class Profile;
|
|
|
| +namespace extensions {
|
| +
|
| typedef std::map<std::string, ExtensionSet::ExtensionPathAndDefaultLocale>
|
| ExtensionsInfo;
|
|
|
| -namespace extensions {
|
| -
|
| // Manages a segment of shared memory that contains the user scripts the user
|
| // has installed. Lives on the UI thread.
|
| class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
|
|
|