OLD | NEW |
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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 params.request_id, | 429 params.request_id, |
430 "No main frame", | 430 "No main frame", |
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, HostID(HostID::EXTENSIONS, params.extension_id), |
440 HostID(HostID::EXTENSIONS, params.extension_id), | 440 ConsumerInstanceInfo( |
441 params.is_web_view ? params.instance_id : HostID::kDefaultInstanceId, | 441 params.is_web_view ? ConsumerInstanceInfo::WEBVIEW |
| 442 : ConsumerInstanceInfo::TAB, |
| 443 params.is_web_view ? params.instance_id : HostID::kDefaultInstanceId), |
442 static_cast<UserScript::RunLocation>(params.run_at), | 444 static_cast<UserScript::RunLocation>(params.run_at), |
443 ExtensionHelper::Get(render_view)->tab_id())); | 445 ExtensionHelper::Get(render_view)->tab_id())); |
444 | 446 |
445 ScriptsRunInfo scripts_run_info; | 447 ScriptsRunInfo scripts_run_info; |
446 FrameStatusMap::const_iterator iter = frame_statuses_.find(main_frame); | 448 FrameStatusMap::const_iterator iter = frame_statuses_.find(main_frame); |
447 | 449 |
448 scoped_ptr<ExtensionInjectionHost> extension_injection_host = | 450 scoped_ptr<ExtensionInjectionHost> extension_injection_host = |
449 GetExtensionInjectionHost(injection->host_id().id(), extensions_); | 451 GetExtensionInjectionHost(injection->host_id().id(), extensions_); |
450 | 452 |
451 if (!injection->TryToInject( | 453 if (!injection->TryToInject( |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 ScriptsRunInfo scripts_run_info; | 507 ScriptsRunInfo scripts_run_info; |
506 scoped_ptr<ExtensionInjectionHost> extension_injection_host = | 508 scoped_ptr<ExtensionInjectionHost> extension_injection_host = |
507 GetExtensionInjectionHost(injection->host_id().id(), extensions_); | 509 GetExtensionInjectionHost(injection->host_id().id(), extensions_); |
508 if (injection->OnPermissionGranted(extension_injection_host.get(), | 510 if (injection->OnPermissionGranted(extension_injection_host.get(), |
509 &scripts_run_info)) { | 511 &scripts_run_info)) { |
510 scripts_run_info.LogRun(injection->web_frame(), UserScript::RUN_DEFERRED); | 512 scripts_run_info.LogRun(injection->web_frame(), UserScript::RUN_DEFERRED); |
511 } | 513 } |
512 } | 514 } |
513 | 515 |
514 } // namespace extensions | 516 } // namespace extensions |
OLD | NEW |