Commit a46be91a authored by Wei Lee's avatar Wei Lee Committed by Chromium LUCI CQ

[CCA] Don't enable DevTools for Test page

Bug: b/176305892, b/174728995
Test: tast run [DUT] camera.CCAUI*
Change-Id: I1bbbe6c7f95fd44c216ffdebaab8b9c0c5f6eadd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2603757Reviewed-by: default avatarShik Chen <shik@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Auto-Submit: Wei Lee <wtlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839323}
parent 4f91debb
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "ash/public/cpp/window_properties.h" #include "ash/public/cpp/window_properties.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/strings/string_util.h"
#include "chromeos/components/camera_app_ui/camera_app_helper_impl.h" #include "chromeos/components/camera_app_ui/camera_app_helper_impl.h"
#include "chromeos/components/camera_app_ui/resources.h" #include "chromeos/components/camera_app_ui/resources.h"
#include "chromeos/components/camera_app_ui/url_constants.h" #include "chromeos/components/camera_app_ui/url_constants.h"
...@@ -266,12 +267,15 @@ CameraAppWindowManager* CameraAppUI::app_window_manager() { ...@@ -266,12 +267,15 @@ CameraAppWindowManager* CameraAppUI::app_window_manager() {
} }
const GURL& CameraAppUI::url() { const GURL& CameraAppUI::url() {
return web_ui()->GetWebContents()->GetURL(); return web_ui()->GetWebContents()->GetLastCommittedURL();
} }
void CameraAppUI::DevToolsAgentHostAttached( void CameraAppUI::DevToolsAgentHostAttached(
content::DevToolsAgentHost* agent_host) { content::DevToolsAgentHost* agent_host) {
if (agent_host->GetWebContents() != web_ui()->GetWebContents()) { if (agent_host->GetWebContents() == nullptr ||
!base::StartsWith(
agent_host->GetWebContents()->GetLastCommittedURL().spec(),
kChromeUICameraAppMainURL)) {
return; return;
} }
app_window_manager()->SetDevToolsEnabled(true); app_window_manager()->SetDevToolsEnabled(true);
...@@ -279,7 +283,10 @@ void CameraAppUI::DevToolsAgentHostAttached( ...@@ -279,7 +283,10 @@ void CameraAppUI::DevToolsAgentHostAttached(
void CameraAppUI::DevToolsAgentHostDetached( void CameraAppUI::DevToolsAgentHostDetached(
content::DevToolsAgentHost* agent_host) { content::DevToolsAgentHost* agent_host) {
if (agent_host->GetWebContents() != web_ui()->GetWebContents()) { if (agent_host->GetWebContents() == nullptr ||
!base::StartsWith(
agent_host->GetWebContents()->GetLastCommittedURL().spec(),
kChromeUICameraAppMainURL)) {
return; return;
} }
app_window_manager()->SetDevToolsEnabled(false); app_window_manager()->SetDevToolsEnabled(false);
......
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