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

Unified Diff: extensions/browser/script_executor.cc

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 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 | « extensions/browser/script_executor.h ('k') | extensions/browser/user_script_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/script_executor.cc
diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc
index 0502d898475180afa41575d82c99c294e3bf3666..4f35a3c5283d0968d430d53109338b60927795c7 100644
--- a/extensions/browser/script_executor.cc
+++ b/extensions/browser/script_executor.cc
@@ -33,7 +33,7 @@ const char* kRendererDestroyed = "The tab was closed.";
// corresponding response comes from the renderer, or the renderer is destroyed.
class Handler : public content::WebContentsObserver {
public:
- Handler(ObserverList<ScriptExecutionObserver>* script_observers,
+ Handler(base::ObserverList<ScriptExecutionObserver>* script_observers,
content::WebContents* web_contents,
ExtensionMsg_ExecuteCode_Params* params,
ScriptExecutor::FrameScope scope,
@@ -147,7 +147,7 @@ class Handler : public content::WebContentsObserver {
delete this;
}
- base::WeakPtr<ObserverList<ScriptExecutionObserver>> script_observers_;
+ base::WeakPtr<base::ObserverList<ScriptExecutionObserver>> script_observers_;
// The id of the host (the extension or the webui) doing the injection.
HostID host_id_;
@@ -185,7 +185,7 @@ ScriptExecutionObserver::~ScriptExecutionObserver() {
ScriptExecutor::ScriptExecutor(
content::WebContents* web_contents,
- ObserverList<ScriptExecutionObserver>* script_observers)
+ base::ObserverList<ScriptExecutionObserver>* script_observers)
: next_request_id_(0),
web_contents_(web_contents),
script_observers_(script_observers) {
« no previous file with comments | « extensions/browser/script_executor.h ('k') | extensions/browser/user_script_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698