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, 29 insertions, 5 deletions

diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc
index abed8e6..e18f7d1 100644
--- a/ash/test/test_session_state_delegate.cc
+++ b/ash/test/test_session_state_delegate.cc
@@ -4,10 +4,25 @@
 
 #include "ash/test/test_session_state_delegate.h"
 
+#include <algorithm>
+#include <string>
+
 #include "ash/shell.h"
 #include "ash/system/user/login_status.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+// The the "canonicalized" user ID from a given |email| address.
+std::string GetUserIDFromEmail(const std::string& email) {
+  std::string user_id = email;
+  std::transform(user_id.begin(), user_id.end(), user_id.begin(), ::tolower);
+  return user_id;
+}
+
+}  // namespace
 
 namespace ash {
 namespace test {
@@ -99,13 +114,18 @@ const base::string16 TestSessionStateDelegate::GetUserDisplayName(
 const std::string TestSessionStateDelegate::GetUserEmail(
     MultiProfileIndex index) const {
   switch (index) {
-    case 0: return "first@tray";
-    case 1: return "second@tray";
+    case 0: return "First@tray";  // This is intended to be capitalized.
+    case 1: return "Second@tray";  // This is intended to be capitalized.
     case 2: return "third@tray";
     default: return "someone@tray";
   }
 }
 
+const std::string TestSessionStateDelegate::GetUserID(
+    MultiProfileIndex index) const {
+  return GetUserIDFromEmail(GetUserEmail(index));
+}
+
 const gfx::ImageSkia& TestSessionStateDelegate::GetUserImage(
     MultiProfileIndex index) const {
   return null_image_;
@@ -114,8 +134,10 @@ const gfx::ImageSkia& TestSessionStateDelegate::GetUserImage(
 void TestSessionStateDelegate::GetLoggedInUsers(UserIdList* users) {
 }
 
-void TestSessionStateDelegate::SwitchActiveUser(const std::string& email) {
-  activated_user_ = email;
+void TestSessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
+  // Make sure this is a user id and not an email address.
+  EXPECT_EQ(user_id, GetUserIDFromEmail(user_id));
+  activated_user_ = user_id;
 }
 
 void TestSessionStateDelegate::SwitchActiveUserToNext() {
diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h
index 585521c..105c0b1 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/test/test_session_state_delegate.h
@@ -35,10 +35,12 @@ class TestSessionStateDelegate : public SessionStateDelegate {
       ash::MultiProfileIndex index) const OVERRIDE;
   virtual const std::string GetUserEmail(
       ash::MultiProfileIndex index) const OVERRIDE;
+  virtual const std::string GetUserID(
+      ash::MultiProfileIndex index) const OVERRIDE;
   virtual const gfx::ImageSkia& GetUserImage(
       ash::MultiProfileIndex index) const OVERRIDE;
   virtual void GetLoggedInUsers(UserIdList* users) OVERRIDE;
-  virtual void SwitchActiveUser(const std::string& email) OVERRIDE;
+  virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
   virtual void SwitchActiveUserToNext() OVERRIDE;
   virtual void AddSessionStateObserver(
       ash::SessionStateObserver* observer) OVERRIDE;