| Index: chrome/renderer/extensions/content_watcher.cc
|
| ===================================================================
|
| --- chrome/renderer/extensions/content_watcher.cc (revision 186747)
|
| +++ chrome/renderer/extensions/content_watcher.cc (working copy)
|
| @@ -16,13 +16,11 @@
|
| namespace extensions {
|
|
|
| namespace {
|
| -
|
| class MutationHandler : public ChromeV8Extension {
|
| public:
|
| explicit MutationHandler(Dispatcher* dispatcher,
|
| - v8::Handle<v8::Context> v8_context,
|
| base::WeakPtr<ContentWatcher> content_watcher)
|
| - : ChromeV8Extension(dispatcher, v8_context),
|
| + : ChromeV8Extension(dispatcher),
|
| content_watcher_(content_watcher) {
|
| RouteFunction("FrameMutated",
|
| base::Bind(&MutationHandler::FrameMutated,
|
| @@ -33,7 +31,7 @@
|
| v8::Handle<v8::Value> FrameMutated(const v8::Arguments& args) {
|
| if (content_watcher_) {
|
| content_watcher_->ScanAndNotify(
|
| - WebKit::WebFrame::frameForContext(v8_context()));
|
| + WebKit::WebFrame::frameForCurrentContext());
|
| }
|
| return v8::Undefined();
|
| }
|
| @@ -48,10 +46,9 @@
|
| dispatcher_(dispatcher) {}
|
| ContentWatcher::~ContentWatcher() {}
|
|
|
| -scoped_ptr<NativeHandler> ContentWatcher::MakeNatives(
|
| - v8::Handle<v8::Context> v8_context) {
|
| - return scoped_ptr<NativeHandler>(new MutationHandler(
|
| - dispatcher_, v8_context, weak_ptr_factory_.GetWeakPtr()));
|
| +scoped_ptr<NativeHandler> ContentWatcher::MakeNatives() {
|
| + return scoped_ptr<NativeHandler>(
|
| + new MutationHandler(dispatcher_, weak_ptr_factory_.GetWeakPtr()));
|
| }
|
|
|
| void ContentWatcher::OnWatchPages(
|
|
|