Move avatar holder code to ash

chrome/browser/ui/browser_navigator_browsertest_chromeos.cc

 // Copyright (c) 2012 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/browser_navigator_browsertest.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
@@ skipping 29 matching lines @@
   virtual void SetWindowOwner(
       aura::Window* window, const std::string& user_id) OVERRIDE;
   virtual const std::string& GetWindowOwner(aura::Window* window) OVERRIDE;
   virtual void ShowWindowForUser(
       aura::Window* window, const std::string& user_id) OVERRIDE;
   virtual bool AreWindowsSharedAmongUsers() OVERRIDE;
   virtual void GetOwnersOfVisibleWindows(
       std::set<std::string>* user_ids) OVERRIDE;
   virtual bool IsWindowOnDesktopOfUser(aura::Window* window,
                                        const std::string& user_id) OVERRIDE;
+  virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
   virtual const std::string& GetUserPresentingWindow(
       aura::Window* window) OVERRIDE;
-  virtual void AddUser(Profile* profile) OVERRIDE;
+  virtual void AddUser(content::BrowserContext* profile) OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
 
  private:
   // The window of the visiting browser.
   aura::Window* browser_window_;
   // The owner of the visiting browser.
   std::string browser_owner_;
   // The owner of the currently shown desktop.
   std::string desktop_owner_;
@@ skipping 56 matching lines @@
 void TestMultiUserWindowManager::GetOwnersOfVisibleWindows(
     std::set<std::string>* user_ids) {
 }
 
 bool TestMultiUserWindowManager::IsWindowOnDesktopOfUser(
     aura::Window* window,
     const std::string& user_id) {
   return GetUserPresentingWindow(window) == user_id;
 }
 
+bool TestMultiUserWindowManager::ShouldShowAvatar(aura::Window* window) {
+  return false;
+}
+
 const std::string& TestMultiUserWindowManager::GetUserPresentingWindow(
     aura::Window* window) {
   if (window == browser_window_)
     return desktop_owner_;
   if (created_window_ && window == created_window_)
     return created_window_shown_for_;
   // We can come here before the window gets registered.
   return browser_owner_;
 }
 
-void TestMultiUserWindowManager::AddUser(Profile* profile) {
+void TestMultiUserWindowManager::AddUser(content::BrowserContext* profile) {
 }
 
 void TestMultiUserWindowManager::AddObserver(Observer* observer) {
 }
 
 void TestMultiUserWindowManager::RemoveObserver(Observer* observer) {
 }
 
 GURL GetGoogleURL() {
   return GURL("http://www.google.com/");
@@ skipping 87 matching lines @@
 
     EXPECT_EQ(3u, chrome::GetTotalBrowserCount());
 
     // The ShowWindowForUser should not have been called since the window is
     // already on the correct desktop.
     ASSERT_FALSE(manager->created_window());
   }
 }
 
 }  // namespace