Cross-platform plumbing for resize-to-client

remoting/tools/me2me_virtual_host.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Virtual Me2Me implementation.  This script runs and manages the processes
 # required for a Virtual Me2Me desktop, which are: X server, X desktop
 # session, and Host process.
 # This script is intended to run continuously as a background daemon
 # process, running under an ordinary (non-root) user account.
@@ skipping 235 matching lines @@
     display = self.get_unused_display_number()
     ret_code = subprocess.call("xauth add :%d . `mcookie`" % display,
                                shell=True)
     if ret_code != 0:
       raise Exception("xauth failed with code %d" % ret_code)
 
     max_width = max([width for width, height in self.sizes])
     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"
 
     logging.info("Starting %s on display :%d" % (xvfb, display))
     screen_option = "%dx%dx24" % (max_width, max_height)
     self.x_proc = subprocess.Popen([xvfb, ":%d" % display,
                                     "-noreset",
                                     "-auth", X_AUTH_FILE,
                                     "-nolisten", "tcp",
                                     "-screen", "0", screen_option
@@ skipping 580 matching lines @@
         return 0
       elif os.WEXITSTATUS(status) == 5:
         logging.info("Host domain is blocked by policy - exiting.")
         os.remove(host.config_file)
         return 0
       # Nothing to do for Mac-only status 6 (login screen unsupported)
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG)
   sys.exit(main())