Chromium Code Reviews| Index: extensions/renderer/script_injection.cc |
| diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc |
| index 12d7cfd0d19561cdfceb681009af0db64ab3ee93..dfc402de4909164e10222e3ab825fa3f2d2fa44a 100644 |
| --- a/extensions/renderer/script_injection.cc |
| +++ b/extensions/renderer/script_injection.cc |
| @@ -140,14 +140,6 @@ ScriptInjection::InjectionResult ScriptInjection::TryToInject( |
| NotifyWillNotInject(ScriptInjector::NOT_ALLOWED); |
| return INJECTION_FINISHED; // We're done. |
| case PermissionsData::ACCESS_WITHHELD: |
| - // Note: we don't consider ACCESS_WITHHELD for child frames because there |
| - // is nowhere to surface a request for a child frame. |
| - // TODO(devlin): We should ask for permission somehow. crbug.com/491402. |
| - if (web_frame->parent()) { |
| - NotifyWillNotInject(ScriptInjector::NOT_ALLOWED); |
| - return INJECTION_FINISHED; |
| - } |
| - |
| SendInjectionMessage(true /* request permission */); |
|
not at google - send to devlin
2015/09/11 22:46:39
This change means that you're always going to be s
Devlin
2015/09/11 22:55:02
Nope, because the logic to choose allowed or not a
not at google - send to devlin
2015/09/11 23:09:49
I see. I read these methods in reverse.
|
| return INJECTION_WAITING; // Wait around for permission. |
| case PermissionsData::ACCESS_ALLOWED: |