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

Unified Diff: media/capture/content/screen_capture_device_core.h

Issue 1418263006: Extend VideoCaptureDevice::Client::OnError() to have a tracked_objects::Location param. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: media/capture/content/screen_capture_device_core.h
diff --git a/media/capture/content/screen_capture_device_core.h b/media/capture/content/screen_capture_device_core.h
index 0720094f5b88a06d9492b409c15bd96edcfa705a..d7250e74025dce7c98bdaa4364b150a0c9b8093c 100644
--- a/media/capture/content/screen_capture_device_core.h
+++ b/media/capture/content/screen_capture_device_core.h
@@ -14,6 +14,10 @@
#include "media/capture/content/thread_safe_capture_oracle.h"
#include "media/capture/video/video_capture_device.h"
+namespace tracked_objects {
+class Location;
+} // namespace tracked_objects
+
namespace media {
struct VideoCaptureParams;
@@ -68,7 +72,7 @@ class MEDIA_EXPORT ScreenCaptureDeviceCore
private:
// Flag indicating current state.
- enum State { kIdle, kCapturing, kError };
+ enum State { kIdle, kCapturing, kError, kLastCaptureState };
void TransitionStateTo(State next_state);
@@ -77,7 +81,8 @@ class MEDIA_EXPORT ScreenCaptureDeviceCore
void CaptureStarted(bool success);
// Stops capturing and notifies client_ of an error state.
- void Error(const std::string& reason);
+ void Error(const tracked_objects::Location& from_here,
+ const std::string& reason);
// Tracks that all activity occurs on the media stream manager's thread.
base::ThreadChecker thread_checker_;

Powered by Google App Engine
This is Rietveld 408576698