chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index 65946a326c83b1775a1c762e51e0b86bdfd7cd5c..b9ae930a26c6c306e24d893f0217d8cc3adbbe9d 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -53,6 +53,7 @@

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

#include "chrome/browser/chromeos/login/users/fake_user_manager.h"

+#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

#include "chrome/browser/ui/apps/chrome_app_delegate.h"

#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"

#include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"

@@ -925,7 +926,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest

chromeos::FakeUserManager* GetFakeUserManager() {

return static_cast<chromeos::FakeUserManager*>(

- chromeos::UserManager::Get());

+ user_manager::UserManager::Get());

}

scoped_ptr<TestingProfileManager> profile_manager_;