Adding "teleport windows to user X" context menu

This adds the teleport items to the context menu. At the same time I was also adding a GetUserID function to the SessionStateController to avoid adding the sanitization of the user names all over the place.

BUG=306143
TEST=visual, a few things got handled by unit tests

Review URL: https://codereview.chromium.org/27217003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229607 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 5 deletions

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index fe1439c..ba62612 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -123,7 +123,7 @@ void SwitchUser(ash::MultiProfileIndex user_index) {
       ash::Shell::GetInstance()->session_state_delegate();
   ash::MultiProfileUMA::RecordSwitchActiveUser(
       ash::MultiProfileUMA::SWITCH_ACTIVE_USER_BY_TRAY);
-  delegate->SwitchActiveUser(delegate->GetUserEmail(user_index));
+  delegate->SwitchActiveUser(delegate->GetUserID(user_index));
 }
 
 }  // namespace
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc
index 5f4cbe1..f969344 100644
--- a/ash/system/user/tray_user_unittest.cc
+++ b/ash/system/user/tray_user_unittest.cc
@@ -229,10 +229,12 @@ TEST_F(TrayUserTest, MutiUserModeButtonClicks) {
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ShowTrayMenu(&generator);
 
-  // Switch to a new user.
+  // Switch to a new user - which has a capitalized name.
   ClickUserItem(&generator, 1);
-
-  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserEmail(1));
+  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserID(1));
+  // Since the name is capitalized, the email should be different then the
+  // user_id.
+  EXPECT_NE(delegate()->get_activated_user(), delegate()->GetUserEmail(1));
   tray()->CloseSystemBubble();
 }
 
@@ -285,7 +287,7 @@ TEST_F(TrayUserTest, CheckTrayUserItems) {
 
   generator.MoveMouseTo(point.x(), point.y());
   generator.ClickLeftButton();
-  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserEmail(2));
+  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserID(2));
 }
 
 #endif