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

Unified Diff: extensions/renderer/script_injection.cc

Issue 2089333002: [Extensions] Add renderer-side logic to short circuit activity logging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
Index: extensions/renderer/script_injection.cc
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index f867800b03f3569e402eda5954263fcaa432cc1c..da93590c3908c00fb33421a2b3ff9f1077e04b06 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -119,7 +119,8 @@ ScriptInjection::ScriptInjection(
std::unique_ptr<ScriptInjector> injector,
content::RenderFrame* render_frame,
std::unique_ptr<const InjectionHost> injection_host,
- UserScript::RunLocation run_location)
+ UserScript::RunLocation run_location,
+ bool log_activity)
: injector_(std::move(injector)),
render_frame_(render_frame),
injection_host_(std::move(injection_host)),
@@ -127,6 +128,7 @@ ScriptInjection::ScriptInjection(
request_id_(kInvalidRequestId),
complete_(false),
did_inject_js_(false),
+ log_activity_(log_activity),
frame_watcher_(new FrameWatcher(render_frame, this)),
weak_ptr_factory_(this) {
CHECK(injection_host_.get());
@@ -253,7 +255,7 @@ void ScriptInjection::InjectJs() {
weak_ptr_factory_.GetWeakPtr())));
base::ElapsedTimer exec_timer;
- if (injection_host_->id().type() == HostID::EXTENSIONS)
+ if (injection_host_->id().type() == HostID::EXTENSIONS && log_activity_)
DOMActivityLogger::AttachToWorld(world_id, injection_host_->id().id());
if (in_main_world) {
// We only inject in the main world for javascript: urls.

Powered by Google App Engine
This is Rietveld 408576698