| Index: chrome/renderer/extensions/dispatcher.cc
|
| diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
|
| index dcd161f2882601b4a22f1d81bddf5703b8b32d0c..879a129bda07a2c321df2f051462accd0a0fb59b 100644
|
| --- a/chrome/renderer/extensions/dispatcher.cc
|
| +++ b/chrome/renderer/extensions/dispatcher.cc
|
| @@ -319,7 +319,10 @@ static v8::Handle<v8::Object> GetOrCreateChrome(
|
| } // namespace
|
|
|
| Dispatcher::Dispatcher()
|
| - : content_watcher_(new ContentWatcher(this)),
|
| + : content_watcher_(new ContentWatcher(this)), // TODO(jyasskin):
|
| + // Move this to
|
| + // ExtensionHelper
|
| + // if possible.
|
| is_webkit_initialized_(false),
|
| webrequest_adblock_(false),
|
| webrequest_adblock_plus_(false),
|
| @@ -574,8 +577,6 @@ void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system,
|
| module_system->RegisterNativeHandler("setIcon",
|
| scoped_ptr<NativeHandler>(
|
| new SetIconNatives(this, request_sender_.get())));
|
| - module_system->RegisterNativeHandler("contentWatcherNative",
|
| - content_watcher_->MakeNatives());
|
|
|
| // Natives used by multiple APIs.
|
| module_system->RegisterNativeHandler("file_system_natives",
|
| @@ -889,6 +890,15 @@ void Dispatcher::DidCreateDocumentElement(WebKit::WebFrame* frame) {
|
| content_watcher_->DidCreateDocumentElement(frame);
|
| }
|
|
|
| +void Dispatcher::CssMatches(
|
| + WebKit::WebFrame* frame,
|
| + const WebKit::WebVector<WebKit::WebString>& newlyMatchingSelectors,
|
| + const WebKit::WebVector<WebKit::WebString>& stoppedMatchingSelectors) {
|
| + content_watcher_->CssMatches(frame, newlyMatchingSelectors,
|
| + stoppedMatchingSelectors);
|
| +}
|
| +
|
| +
|
| void Dispatcher::OnActivateExtension(const std::string& extension_id) {
|
| active_extension_ids_.insert(extension_id);
|
| const Extension* extension = extensions_.GetByID(extension_id);
|
|
|