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

Unified Diff: remoting/tools/me2me_virtual_host.py

Issue 10918224: Cross-platform plumbing for resize-to-client (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up SkISize zero check. Fixed XFlush bug. Created 8 years, 3 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
« remoting/host/desktop_resizer_linux.cc ('K') | « remoting/remoting.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/tools/me2me_virtual_host.py
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py
index 1438bf472f38bd86cd3853da1e0c906613f8dbd2..ef9d2fbab2069bd81d802e1b2dce17ba2650109e 100755
--- a/remoting/tools/me2me_virtual_host.py
+++ b/remoting/tools/me2me_virtual_host.py
@@ -253,7 +253,12 @@ class Desktop:
max_height = max([height for width, height in self.sizes])
try:
- xvfb = locate_executable("Xvfb-randr")
+ # TODO(jamiewalch): This script expects to be installed alongside
+ # Xvf-randr, but that's no longer the case. Fix this once we have
+ # a Xvfb-randr package that installs somewhere sensible.
+ xvfb = "/usr/bin/Xvfb-randr"
+ if not os.path.exists(xvfb):
+ xvfb = locate_executable("Xvfb-randr")
except Exception:
xvfb = "Xvfb"
« remoting/host/desktop_resizer_linux.cc ('K') | « remoting/remoting.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698