TrayUser::GetTrayIndex method removed as not necessary. Swich->Switch renamed.

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_
 
 #include <map>
 #include <string>
 
@@ skipping 21 matching lines @@
 
 namespace ash {
 namespace test {
 class MultiUserWindowManagerChromeOSTest;
 }  // namespace test
 }  // namespace ash
 
 namespace chrome {
 
 class AppObserver;
-class UserSwichAnimatorChromeOS;
+class UserSwitchAnimatorChromeOS;
 
 // This ChromeOS implementation of the MultiUserWindowManager interface is
 // detecting app and browser creations, tagging their windows automatically and
 // using (currently) show and hide to make the owned windows visible - or not.
 // If it becomes necessary, the function |SetWindowVisibility| can be
 // overwritten to match new ways of doing this.
 // Note:
 // - aura::Window::Hide() is currently hiding the window and all owned transient
 //   children. However aura::Window::Show() is only showing the window itself.
 //   To address that, all transient children (and their children) are remembered
@@ skipping 63 matching lines @@
   // Disable any animations for unit tests.
   void SetAnimationSpeedForTest(AnimationSpeed speed);
 
   // Returns true when a user switch animation is running. For unit tests.
   bool IsAnimationRunningForTest();
 
   // Returns the current user for unit tests.
   const std::string& GetCurrentUserForTest() const;
 
  protected:
-  friend class UserSwichAnimatorChromeOS;
+  friend class UserSwitchAnimatorChromeOS;
 
   class WindowEntry {
    public:
     explicit WindowEntry(const std::string& user_id)
         : owner_(user_id),
           show_for_user_(user_id),
           show_(true) {}
     virtual ~WindowEntry() {}
 
     // Returns the owner of this window. This cannot be changed.
@@ skipping 118 matching lines @@
   bool suppress_visibility_changes_;
 
   // Caching the current multi profile mode since the detection which mode is
   // used is quite expensive.
   static MultiProfileMode multi_user_mode_;
 
   // The speed which is used to perform any animations.
   AnimationSpeed animation_speed_;
 
   // The animation between users.
-  scoped_ptr<UserSwichAnimatorChromeOS> animation_;
+  scoped_ptr<UserSwitchAnimatorChromeOS> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOS);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_