Index: chrome/renderer/extensions/dispatcher.cc |
=================================================================== |
--- chrome/renderer/extensions/dispatcher.cc (revision 185934) |
+++ chrome/renderer/extensions/dispatcher.cc (working copy) |
@@ -28,6 +28,7 @@ |
#include "chrome/renderer/extensions/chrome_v8_extension.h" |
#include "chrome/renderer/extensions/content_watcher.h" |
#include "chrome/renderer/extensions/context_menus_custom_bindings.h" |
+#include "chrome/renderer/extensions/dom_activity_logger.h" |
#include "chrome/renderer/extensions/event_bindings.h" |
#include "chrome/renderer/extensions/extension_custom_bindings.h" |
#include "chrome/renderer/extensions/extension_groups.h" |
@@ -57,6 +58,7 @@ |
#include "content/public/renderer/render_thread.h" |
#include "content/public/renderer/render_view.h" |
#include "grit/renderer_resources.h" |
+ |
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" |
@@ -911,9 +913,15 @@ |
RenderThread::Get()->ScheduleIdleHandler(kInitialExtensionIdleHandlerDelayMs); |
UpdateActiveExtensions(); |
+ if (is_webkit_initialized_) { |
+ InitOriginPermissions(extension); |
- if (is_webkit_initialized_) |
- InitOriginPermissions(extension); |
+ // DOMActivity loggers for an extension background page get an empty title. |
Matt Perry
2013/03/05 02:32:37
FYI this happens on any type of extension page (li
Ankur Taly
2013/03/05 20:03:32
Yes and I intend to cover all such cases. I assume
Matt Perry
2013/03/05 20:34:22
Yes. (You should update the comment, though.)
On
|
+ DOMActivityLogger::attachToWorld(DOMActivityLogger::kMainWorldId, |
+ extension_id, |
+ extension->url(), |
+ string16()); |
+ } |
} |
void Dispatcher::InitOriginPermissions(const Extension* extension) { |