summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/user_script_master.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/user_script_master.h')
-rw-r--r--chrome/browser/extensions/user_script_master.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 2ec773b..c33fb27 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -19,8 +19,8 @@
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/extensions/user_script.h"
#include "content/browser/browser_thread.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
namespace base {
class StringPiece;
@@ -35,7 +35,7 @@ typedef std::map<std::string, ExtensionSet::ExtensionPathAndDefaultLocale>
// 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>,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
explicit UserScriptMaster(Profile* profile);
@@ -129,17 +129,17 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
};
private:
- // NotificationObserver implementation.
+ // content::NotificationObserver implementation.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) OVERRIDE;
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
// Sends the renderer process a new set of user scripts.
void SendUpdate(RenderProcessHost* process,
base::SharedMemory* shared_memory);
// Manages our notification registrations.
- NotificationRegistrar registrar_;
+ content::NotificationRegistrar registrar_;
// We hang on to our pointer to know if we've already got one running.
scoped_refptr<ScriptReloader> script_reloader_;