Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5192)

Unified Diff: chrome/browser/extensions/extension_activity_log.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_activity_log.h ('k') | chrome/browser/extensions/extension_apitest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_activity_log.cc
diff --git a/chrome/browser/extensions/extension_activity_log.cc b/chrome/browser/extensions/extension_activity_log.cc
index 85ad4d2cee9ad67b639bd65c2649a5a018a638b2..ea9a0486b5d55868c98b0c9f20cad21e745adaaa 100644
--- a/chrome/browser/extensions/extension_activity_log.cc
+++ b/chrome/browser/extensions/extension_activity_log.cc
@@ -23,7 +23,7 @@ ExtensionActivityLog* ExtensionActivityLog::GetInstance() {
}
void ExtensionActivityLog::AddObserver(
- const Extension* extension,
+ const extensions::Extension* extension,
ExtensionActivityLog::Observer* observer) {
base::AutoLock scoped_lock(lock_);
@@ -35,7 +35,7 @@ void ExtensionActivityLog::AddObserver(
}
void ExtensionActivityLog::RemoveObserver(
- const Extension* extension,
+ const extensions::Extension* extension,
ExtensionActivityLog::Observer* observer) {
base::AutoLock scoped_lock(lock_);
@@ -43,8 +43,9 @@ void ExtensionActivityLog::RemoveObserver(
observers_[extension]->RemoveObserver(observer);
}
}
-
-bool ExtensionActivityLog::HasObservers(const Extension* extension) const {
+// Extension*
+bool ExtensionActivityLog::HasObservers(
+ const extensions::Extension* extension) const {
base::AutoLock scoped_lock(lock_);
// We also return true if extension activity logging is enabled since in that
@@ -52,7 +53,7 @@ bool ExtensionActivityLog::HasObservers(const Extension* extension) const {
return observers_.count(extension) > 0 || log_activity_to_stdout_;
}
-void ExtensionActivityLog::Log(const Extension* extension,
+void ExtensionActivityLog::Log(const extensions::Extension* extension,
Activity activity,
const std::string& msg) const {
base::AutoLock scoped_lock(lock_);
« no previous file with comments | « chrome/browser/extensions/extension_activity_log.h ('k') | chrome/browser/extensions/extension_apitest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698