Chromium Code Reviews| Index: content/renderer/web_ui_extension.cc |
| diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc |
| index cb42f6063ddc72b0f75e2269b802d50e0162cae1..3ad5679561738985e94d2093d5e5edda2b12eaec 100644 |
| --- a/content/renderer/web_ui_extension.cc |
| +++ b/content/renderer/web_ui_extension.cc |
| @@ -14,6 +14,7 @@ |
| #include "content/public/common/bindings_policy.h" |
| #include "content/public/common/url_constants.h" |
| #include "content/public/renderer/chrome_object_extensions_utils.h" |
| +#include "content/public/renderer/render_frame.h" |
| #include "content/public/renderer/render_thread.h" |
| #include "content/public/renderer/render_view.h" |
| #include "content/renderer/web_ui_extension_data.h" |
| @@ -44,8 +45,12 @@ bool ShouldRespondToRequest( |
| GURL frame_url = frame->document().url(); |
| + RenderFrame* render_frame = render_view->GetMainRenderFrame(); |
|
Charlie Reis
2016/12/16 01:01:52
Is this wrong? The frame_ptr passed in might not
Sam McNally
2017/01/12 09:27:09
Done.
|
| + if (!render_frame) |
| + return false; |
| + |
| bool webui_enabled = |
| - (render_view->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) && |
| + (render_frame->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) && |
| (frame_url.SchemeIs(kChromeUIScheme) || |
| frame_url.SchemeIs(url::kDataScheme)); |