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

Side by Side Diff: extensions/renderer/script_injection_manager.cc

Issue 906493004: Refactoring: de-couple Extensions from "script injection System" [render side]:2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decouple_brower_isolated_world_1
Patch Set: Rebase and remove ConsumerInstanceInfo(id). Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/renderer/script_injection_manager.h" 5 #include "extensions/renderer/script_injection_manager.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 GURL(std::string()), 431 GURL(std::string()),
432 base::ListValue())); 432 base::ListValue()));
433 return; 433 return;
434 } 434 }
435 435
436 scoped_ptr<ScriptInjection> injection(new ScriptInjection( 436 scoped_ptr<ScriptInjection> injection(new ScriptInjection(
437 scoped_ptr<ScriptInjector>( 437 scoped_ptr<ScriptInjector>(
438 new ProgrammaticScriptInjector(params, main_frame)), 438 new ProgrammaticScriptInjector(params, main_frame)),
439 main_frame, 439 main_frame,
440 HostID(HostID::EXTENSIONS, params.extension_id), 440 HostID(HostID::EXTENSIONS, params.extension_id),
441 params.is_web_view ? UserScript::ConsumerInstanceType::WEBVIEW
442 : UserScript::ConsumerInstanceType::TAB,
441 static_cast<UserScript::RunLocation>(params.run_at), 443 static_cast<UserScript::RunLocation>(params.run_at),
442 ExtensionHelper::Get(render_view)->tab_id())); 444 ExtensionHelper::Get(render_view)->tab_id()));
443 445
444 ScriptsRunInfo scripts_run_info; 446 ScriptsRunInfo scripts_run_info;
445 FrameStatusMap::const_iterator iter = frame_statuses_.find(main_frame); 447 FrameStatusMap::const_iterator iter = frame_statuses_.find(main_frame);
446 448
447 scoped_ptr<ExtensionInjectionHost> extension_injection_host = 449 scoped_ptr<ExtensionInjectionHost> extension_injection_host =
448 GetExtensionInjectionHost(injection->host_id().id(), extensions_); 450 GetExtensionInjectionHost(injection->host_id().id(), extensions_);
449 451
450 if (!injection->TryToInject( 452 if (!injection->TryToInject(
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 ScriptsRunInfo scripts_run_info; 506 ScriptsRunInfo scripts_run_info;
505 scoped_ptr<ExtensionInjectionHost> extension_injection_host = 507 scoped_ptr<ExtensionInjectionHost> extension_injection_host =
506 GetExtensionInjectionHost(injection->host_id().id(), extensions_); 508 GetExtensionInjectionHost(injection->host_id().id(), extensions_);
507 if (injection->OnPermissionGranted(extension_injection_host.get(), 509 if (injection->OnPermissionGranted(extension_injection_host.get(),
508 &scripts_run_info)) { 510 &scripts_run_info)) {
509 scripts_run_info.LogRun(injection->web_frame(), UserScript::RUN_DEFERRED); 511 scripts_run_info.LogRun(injection->web_frame(), UserScript::RUN_DEFERRED);
510 } 512 }
511 } 513 }
512 514
513 } // namespace extensions 515 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698