Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/ash/system/user/user_view.cc

 // 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.
 
 #include "ash/system/user/user_view.h"
 
 #include <algorithm>
 
 #include "ash/multi_profile_uma.h"
 #include "ash/popup_message.h"
-#include "ash/session/session_state_delegate.h"
-#include "ash/session/user_info.h"
+#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_popup_label_button.h"
 #include "ash/system/tray/tray_popup_label_button_border.h"
 #include "ash/system/user/button_from_view.h"
 #include "ash/system/user/config.h"
 #include "ash/system/user/rounded_image_view.h"
 #include "ash/system/user/user_card_view.h"
@@ skipping 47 matching lines @@
   if (ash::Shell::GetInstance()
           ->session_state_delegate()
           ->IsUserSessionBlocked())
     return;
 
   DCHECK(user_index > 0);
   ash::SessionStateDelegate* delegate =
       ash::Shell::GetInstance()->session_state_delegate();
   ash::MultiProfileUMA::RecordSwitchActiveUser(
       ash::MultiProfileUMA::SWITCH_ACTIVE_USER_BY_TRAY);
-  delegate->SwitchActiveUser(delegate->GetUserInfo(user_index)->GetUserID());
+  delegate->SwitchActiveUser(delegate->GetUserID(user_index));
 }
 
 class LogoutButton : public TrayPopupLabelButton {
  public:
   // If |placeholder| is true, button is used as placeholder. That means that
   // button is inactive and is not painted, but consume the same ammount of
   // space, as if it was painted.
   LogoutButton(views::ButtonListener* listener,
                const base::string16& text,
                bool placeholder)
@@ skipping 391 matching lines @@
   // watcher which will close the "menu".
   gfx::Rect area = user_card_view_->GetBoundsInScreen();
   area.set_height(2 * area.height());
   mouse_watcher_.reset(
       new views::MouseWatcher(new UserViewMouseWatcherHost(area), this));
   mouse_watcher_->Start();
 }
 
 }  // namespace tray
 }  // namespace ash