Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1158)

Unified Diff: content/browser/devtools/protocol/dom_handler.cc

Issue 635533004: [DevTools] Move DOM domain overrides to DOMHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for Windows again Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/protocol/dom_handler.cc
diff --git a/content/browser/devtools/protocol/dom_handler.cc b/content/browser/devtools/protocol/dom_handler.cc
index 84533359dc687f166329a9992411dee2f55b9baf..9ddf4092b5253fae4a04ae95c475a9597f9fb2dc 100644
--- a/content/browser/devtools/protocol/dom_handler.cc
+++ b/content/browser/devtools/protocol/dom_handler.cc
@@ -4,20 +4,41 @@
#include "content/browser/devtools/protocol/dom_handler.h"
+#include "base/strings/utf_string_conversions.h"
+#include "content/browser/child_process_security_policy_impl.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+
namespace content {
namespace devtools {
namespace dom {
typedef DevToolsProtocolClient::Response Response;
-DOMHandler::DOMHandler() {
+DOMHandler::DOMHandler() : host_(nullptr) {
}
DOMHandler::~DOMHandler() {
}
+void DOMHandler::SetRenderViewHost(RenderViewHostImpl* host) {
+ host_ = host;
+}
+
Response DOMHandler::SetFileInputFiles(NodeId node_id,
const std::vector<std::string>& files) {
+ if (host_) {
+ for (const auto& file : files) {
+#if defined(OS_WIN)
+ ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile(
+ host_->GetProcess()->GetID(),
+ base::FilePath(base::UTF8ToUTF16(file)));
+#else
+ ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile(
+ host_->GetProcess()->GetID(),
+ base::FilePath(file));
+#endif // OS_WIN
+ }
+ }
return Response::FallThrough();
}
« no previous file with comments | « content/browser/devtools/protocol/dom_handler.h ('k') | content/browser/devtools/render_view_devtools_agent_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698