Move avatar holder code to ash

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

 // 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.
 
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
@@ skipping 344 matching lines @@
   }
 }
 
 bool MultiUserWindowManagerChromeOS::IsWindowOnDesktopOfUser(
     aura::Window* window,
     const std::string& user_id) {
   const std::string& presenting_user = GetUserPresentingWindow(window);
   return presenting_user.empty() || presenting_user == user_id;
 }
 
+bool MultiUserWindowManagerChromeOS::ShouldShowAvatar(aura::Window* window) {
+  // Note: In case of the M-31 mode the window manager won't exist.
+  if (GetMultiProfileMode() == MULTI_PROFILE_MODE_SEPARATED) {
+    // If the window is shown on a different desktop than the user, it should
+    // have the avatar icon.
+
+    // Note: When the window manager the window is either on it's owners desktop
+    // (and shows no icon) or it is now (in which it will show an icon). So we
+    // can return here.

[Mr4D (OOO till 08-26), 2014/03/13 00:08:15]

I think you can remove line 370-373.

[oshima, 2014/03/13 01:02:53]

Done.

+    return !IsWindowOnDesktopOfUser(window, GetWindowOwner(window));
+  }
+  return false;
+}
+
 const std::string& MultiUserWindowManagerChromeOS::GetUserPresentingWindow(
     aura::Window* window) {
   WindowToEntryMap::iterator it = window_to_entry_.find(window);
   // If the window is not owned by anyone it is shown on all desktops and we
   // return the empty string.
   if (it == window_to_entry_.end())
     return base::EmptyString();
   // Otherwise we ask the object for its desktop.
   return it->second->show_for_user();
 }
 
-void MultiUserWindowManagerChromeOS::AddUser(Profile* profile) {
+void MultiUserWindowManagerChromeOS::AddUser(content::BrowserContext* context) {
+  Profile* profile = Profile::FromBrowserContext(context);
   const std::string& user_id = multi_user_util::GetUserIDFromProfile(profile);
   if (user_id_to_app_observer_.find(user_id) != user_id_to_app_observer_.end())
     return;
 
   user_id_to_app_observer_[user_id] = new AppObserver(user_id);
   apps::AppWindowRegistry::Get(profile)
       ->AddObserver(user_id_to_app_observer_[user_id]);
 
   // Account all existing application windows of this user accordingly.
   const apps::AppWindowRegistry::AppWindowList& app_windows =
@@ skipping 475 matching lines @@
     window->Show();
   else
     window->Hide();
 
   // Make sure that animations have no influence on the window state after the
   // call.
   DCHECK_EQ(visible, window->IsVisible());
 }
 
 }  // namespace chrome