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

Unified Diff: remoting/host/daemon_process.cc

Issue 13983010: Use webrtc::DesktopCapturer for screen capturer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: q Created 7 years, 8 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: remoting/host/daemon_process.cc
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc
index 50c1b454e39d5f6f9490f97f6e5f685aaf72cacf..4d0e9cb0db77b2bd22a27fa5548a62f003ae5c51 100644
--- a/remoting/host/daemon_process.cc
+++ b/remoting/host/daemon_process.cc
@@ -29,9 +29,9 @@ namespace {
const char kApplicationName[] = "chromoting";
std::ostream& operator<<(std::ostream& os, const ScreenResolution& resolution) {
- return os << resolution.dimensions_.width() << "x"
- << resolution.dimensions_.height() << " at "
- << resolution.dpi_.x() << "x" << resolution.dpi_.y() << " DPI";
+ return os << resolution.dimensions().width() << "x"
+ << resolution.dimensions().height() << " at "
+ << resolution.dpi().x() << "x" << resolution.dpi().y() << " DPI";
}
} // namespace
@@ -188,13 +188,6 @@ void DaemonProcess::CreateDesktopSession(int terminal_id,
// Terminal IDs cannot be reused. Update the expected next terminal ID.
next_terminal_id_ = std::max(next_terminal_id_, terminal_id + 1);
- // Validate |resolution| and restart the sender if it is not valid.
- if (!resolution.IsValid()) {
alexeypa (please no reviews) 2013/04/26 21:33:58 |resolution| is received from less privileged proc
Sergey Ulanov 2013/05/07 22:25:50 There is a check in chromoting_param_traits.cc whe
- LOG(ERROR) << "Invalid resolution specified: " << resolution;
- CrashNetworkProcess(FROM_HERE);
- return;
- }
-
// Create the desktop session.
scoped_ptr<DesktopSession> session = DoCreateDesktopSession(
terminal_id, resolution, virtual_terminal);
@@ -223,7 +216,7 @@ void DaemonProcess::SetScreenResolution(int terminal_id,
}
// Validate |resolution| and restart the sender if it is not valid.
- if (!resolution.IsValid()) {
+ if (resolution.IsEmpty()) {
alexeypa (please no reviews) 2013/04/26 21:33:58 nit: IsEmpty() seems to be OK in this case since y
Sergey Ulanov 2013/05/07 22:25:50 Yes, I understand that there is a difference. Inte
LOG(ERROR) << "Invalid resolution specified: " << resolution;
CrashNetworkProcess(FROM_HERE);
return;

Powered by Google App Engine
This is Rietveld 408576698