diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/devtools/protocol/target_handler.cc | |
parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/devtools/protocol/target_handler.cc')
-rw-r--r-- | chromium/content/browser/devtools/protocol/target_handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/content/browser/devtools/protocol/target_handler.cc b/chromium/content/browser/devtools/protocol/target_handler.cc index dda5c814235..390beaf358b 100644 --- a/chromium/content/browser/devtools/protocol/target_handler.cc +++ b/chromium/content/browser/devtools/protocol/target_handler.cc @@ -14,6 +14,7 @@ #include "base/unguessable_token.h" #include "base/values.h" #include "build/build_config.h" +#include "build/lacros_buildflags.h" #include "content/browser/devtools/browser_devtools_agent_host.h" #include "content/browser/devtools/devtools_agent_host_impl.h" #include "content/browser/devtools/devtools_manager.h" @@ -85,6 +86,7 @@ std::unique_ptr<Target::TargetInfo> CreateInfo(DevToolsAgentHost* host) { .SetUrl(host->GetURL().spec()) .SetType(host->GetType()) .SetAttached(host->IsAttached()) + .SetCanAccessOpener(host->CanAccessOpener()) .Build(); if (!host->GetOpenerId().empty()) target_info->SetOpenerId(host->GetOpenerId()); @@ -105,7 +107,7 @@ static std::string TerminationStatusToString(base::TerminationStatus status) { return "crashed"; case base::TERMINATION_STATUS_STILL_RUNNING: return "still running"; -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) // Used for the case when oom-killer kills a process on ChromeOS. case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM: return "oom killed"; |