Commit 2697c72e authored by jam's avatar jam Committed by Commit bot

Fix certificate viewer not showing up for subresources if the devtools window is docked.

BUG=657270

Review-Url: https://chromiumcodereview.appspot.com/2427323005
Cr-Commit-Position: refs/heads/master@{#426917}
parent 8c598600
...@@ -1110,6 +1110,12 @@ bool DevToolsWindow::PreHandleGestureEvent( ...@@ -1110,6 +1110,12 @@ bool DevToolsWindow::PreHandleGestureEvent(
event.type == blink::WebGestureEvent::GesturePinchEnd; event.type == blink::WebGestureEvent::GesturePinchEnd;
} }
void DevToolsWindow::ShowCertificateViewerInDevTools(
content::WebContents* web_contents,
scoped_refptr<net::X509Certificate> certificate) {
ShowCertificateViewer(certificate);
}
void DevToolsWindow::ActivateWindow() { void DevToolsWindow::ActivateWindow() {
if (life_stage_ != kLoadCompleted) if (life_stage_ != kLoadCompleted)
return; return;
......
...@@ -306,6 +306,9 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate, ...@@ -306,6 +306,9 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
const content::FileChooserParams& params) override; const content::FileChooserParams& params) override;
bool PreHandleGestureEvent(content::WebContents* source, bool PreHandleGestureEvent(content::WebContents* source,
const blink::WebGestureEvent& event) override; const blink::WebGestureEvent& event) override;
void ShowCertificateViewerInDevTools(
content::WebContents* web_contents,
scoped_refptr<net::X509Certificate> certificate) override;
// content::DevToolsUIBindings::Delegate overrides // content::DevToolsUIBindings::Delegate overrides
void ActivateWindow() override; void ActivateWindow() override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment