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

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

 // Copyright 2014 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_USER_SWITCH_ANIMATOR_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 
 namespace aura {
 class Window;
 }  // namespace aura
 
 namespace chrome {
 
 class MultiUserWindowManagerChromeOS;
 
 // A class which performs transitions animations between users. Upon creation,
 // the animation gets started and upon destruction the animation gets finished
 // if not done yet.
 // Specifying |animation_disabled| upon creation will perform the transition
 // without visible animations.
-class UserSwichAnimatorChromeOS {
+class UserSwitchAnimatorChromeOS {

[Mr4D (OOO till 08-26), 2015/03/21 20:59:16]

Oh wow. Thanks for fixing the typo! Amazing that no one has noticed!

I am fine with folding this into one CL, but I got already complaints about it.
So you might consider in the future to do that in a separate CL. For now this is
good.

  public:
   // The animation step for the user change animation.
   enum AnimationStep {
     ANIMATION_STEP_HIDE_OLD_USER,  // Hiding the old user (and shelf).
     ANIMATION_STEP_SHOW_NEW_USER,  // Show the shelf of the new user.
     ANIMATION_STEP_FINALIZE,       // All animations are done - final cleanup.
     ANIMATION_STEP_ENDED           // The animation has ended.
   };
 
-  UserSwichAnimatorChromeOS(MultiUserWindowManagerChromeOS* owner,
-                            const std::string& new_user_id,
-                            int animation_speed_ms);
-  ~UserSwichAnimatorChromeOS();
+  UserSwitchAnimatorChromeOS(MultiUserWindowManagerChromeOS* owner,
+                             const std::string& new_user_id,
+                             int animation_speed_ms);
+  ~UserSwitchAnimatorChromeOS();
 
   // Check if a window is covering the entire work area of the screen it is on.
   static bool CoversScreen(aura::Window* window);
 
   bool IsAnimationFinished() {
     return animation_step_ == ANIMATION_STEP_ENDED;
   }
 
   // Returns the user id for which the wallpaper is currently shown.
   // If a wallpaper is transitioning to B it will be returned as "->B".
@@ skipping 53 matching lines @@
   // The screen cover status before the animation has started.
   TransitioningScreenCover screen_cover_;
 
   // A timer which watches to executes the second part of a "user changed"
   // animation. Note that this timer exists only during such an animation.
   scoped_ptr<base::Timer> user_changed_animation_timer_;
 
   // For unit tests: Check which wallpaper was set.
   std::string wallpaper_user_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(UserSwichAnimatorChromeOS);
+  DISALLOW_COPY_AND_ASSIGN(UserSwitchAnimatorChromeOS);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_