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

Unified Diff: chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc

Issue 1135413002: Disable screenshot uploading if there has been user input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed leak in test. Created 5 years, 7 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: chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc
index bcb1ffc7ab3bad070152805a0f1c11f72092d430..bf840f15b671df0317bc96f21b5e5ce1bc7c0940 100644
--- a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc
+++ b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc
@@ -15,6 +15,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/values.h"
+#include "chrome/browser/chromeos/policy/status_uploader.h"
#include "chrome/browser/chromeos/policy/upload_job_impl.h"
#include "content/public/browser/browser_thread.h"
#include "net/http/http_request_headers.h"
@@ -90,9 +91,11 @@ scoped_ptr<std::string> DeviceCommandScreenshotJob::Payload::Serialize() {
}
DeviceCommandScreenshotJob::DeviceCommandScreenshotJob(
- scoped_ptr<Delegate> screenshot_delegate)
+ scoped_ptr<Delegate> screenshot_delegate,
+ StatusUploader* uploader)
: num_pending_screenshots_(0),
screenshot_delegate_(screenshot_delegate.Pass()),
+ status_uploader_(uploader),
weak_ptr_factory_(this) {
DCHECK(screenshot_delegate_);
}
@@ -203,6 +206,13 @@ void DeviceCommandScreenshotJob::RunImpl(
FAILURE_SCREENSHOT_ACQUISITION)))));
}
+ if (!status_uploader_ || !status_uploader_->IsSessionDataUploadAllowed()) {
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+ base::Bind(failed_callback_, base::Passed(make_scoped_ptr(
+ new Payload(FAILURE_USER_INPUT)))));
+ }
+
// Post tasks to the sequenced worker pool for taking screenshots on each
// attached screen.
num_pending_screenshots_ = root_windows.size();

Powered by Google App Engine
This is Rietveld 408576698