Add ability to customise Virtual Me2Me X session.

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 469 matching lines @@
 
   Returns:
     A string containing the command to run, or a list of strings containing
     the executable program and its arguments, which is suitable for passing as
     the first parameter of subprocess.Popen().  If a suitable session cannot
     be found, returns None.
   """
   if XSESSION_COMMAND is not None:
     return XSESSION_COMMAND
 
+  # Use a custom startup file if present
+  startup_file = os.path.expanduser("~/.me2me_session")

[Sergey Ulanov, 2012/07/31 21:09:41]

maybe call it .crd_session or .chrome_remoting_session? Me2Me is just a
codename, we shouldn't use it for user-facing features.

[Lambros, 2012/08/01 23:46:17]

I've changed it to ~/.chrome-remote-desktop-session, which is a bit of a
fistful, but it seems the most logical name (bearing in mind that the config
directory is called chrome-remote-desktop).

+  if os.path.exists(startup_file):
+    # Use the same logic that a Debian system typically uses with ~/.xsession
+    # (see /etc/X11/Xsession.d/50x11-common_determine-startup), to determine
+    # exactly how to run this file.
+    if os.access(startup_file, os.X_OK):
+      return startup_file
+    else:
+      shell = os.environ.get("SHELL", "sh")

[Jamie, 2012/07/31 21:08:06]

Optional: test for undefined SHELL variable?

+      return [shell, startup_file]
+
   # Unity-2d would normally be the preferred choice on Ubuntu 12.04.  At the
   # time of writing, this session does not work properly (missing launcher and
   # panel), so gnome-session-fallback is used in preference.
   # "unity-2d-panel" was chosen here simply because it appears in the TryExec
   # line of the session's .desktop file; other choices might be just as good.
   for test_file, command in [
     ("/usr/bin/gnome-session-fallback", "/usr/bin/gnome-session-fallback"),
     ("/etc/gdm/Xsession", "/etc/gdm/Xsession"),
     ("/usr/bin/unity-2d-panel",
       ["/usr/bin/gnome-session", "--session=ubuntu-2d"]),
@@ skipping 347 matching lines @@
         os.remove(host.config_file)
         return 0
       elif os.WEXITSTATUS(status) == 4:
         logging.info("OAuth credentials are invalid - exiting.")
         os.remove(auth.config_file)
         return 0
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG)
   sys.exit(main())