Chromium Code Reviews| Index: chrome/renderer/extensions/dispatcher.cc |
| =================================================================== |
| --- chrome/renderer/extensions/dispatcher.cc (revision 186214) |
| +++ 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" |
| @@ -711,7 +713,7 @@ |
| void Dispatcher::PopulateLazyBindingsMap() { |
| lazy_bindings_map_["app"] = InstallAppBindings; |
| - lazy_bindings_map_["webstore"] = InstallWebstoreBindings; |
| + lazy_bindings_map_["webactivitystore"] = InstallWebstoreBindings; |
|
Matt Perry
2013/03/07 01:06:26
?
|
| } |
| void Dispatcher::InstallBindings(ModuleSystem* module_system, |
| @@ -911,9 +913,17 @@ |
| RenderThread::Get()->ScheduleIdleHandler(kInitialExtensionIdleHandlerDelayMs); |
| UpdateActiveExtensions(); |
| + if (is_webkit_initialized_) { |
| + InitOriginPermissions(extension); |
| - if (is_webkit_initialized_) |
| - InitOriginPermissions(extension); |
| + // DOMActivity logger for a main world controlled by an extension (as in |
| + // the case of an extension background page, options page, popup etc.) |
| + // gets an empty title. |
| + DOMActivityLogger::AttachToWorld(DOMActivityLogger::kMainWorldId, |
| + extension_id, |
| + extension->url(), |
| + string16()); |
| + } |
| } |
| void Dispatcher::InitOriginPermissions(const Extension* extension) { |