summaryrefslogtreecommitdiffstats
path: root/remoting/tools
diff options
context:
space:
mode:
authorjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 21:49:16 +0000
committerjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 21:49:16 +0000
commit117dcded9523051880fab22bcdad8843657aef8d (patch)
tree3f7921d6f02a05e8a7c76386105ba704769c56b2 /remoting/tools
parent3d72cfac010ab976977c95e831498a9539d543f1 (diff)
downloadchromium_src-117dcded9523051880fab22bcdad8843657aef8d.zip
chromium_src-117dcded9523051880fab22bcdad8843657aef8d.tar.gz
chromium_src-117dcded9523051880fab22bcdad8843657aef8d.tar.bz2
Set CHROME_USER_DATA_DIR when starting the virtual session.
Note that the first time the user runs Chrome in the virtual session, the profile will be created with whatever default settings that version of Chrome sets. Right now, this is a sign-in request page, which is actually pretty good for our intended use-case (rely on Chrome Sync to keep the console and virtual profiles in sync). R=lambroslambrou@chromium.org Review URL: https://codereview.chromium.org/25764002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
-rwxr-xr-xremoting/tools/me2me_virtual_host.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py
index 6a31185..ca22809 100755
--- a/remoting/tools/me2me_virtual_host.py
+++ b/remoting/tools/me2me_virtual_host.py
@@ -342,6 +342,12 @@ class Desktop:
self.child_env["DISPLAY"] = ":%d" % display
self.child_env["CHROME_REMOTE_DESKTOP_SESSION"] = "1"
+ # Use a separate profile for any instances of Chrome that are started in
+ # the virtual session. Chrome doesn't support sharing a profile between
+ # multiple DISPLAYs, but Chrome Sync allows for a reasonable compromise.
+ chrome_profile = os.path.join(CONFIG_DIR, "chrome-profile")
+ self.child_env["CHROME_USER_DATA_DIR"] = chrome_profile
+
# Wait for X to be active.
for _test in range(5):
proc = subprocess.Popen("xdpyinfo", env=self.child_env, stdout=devnull)