chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.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/chromeos/login/demo_mode/demo_app_launcher_browsertest.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/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

index 35f988bf7f5a659ed7cb2c9f01beca9081782102..c65f0cf732f5ac697a0fb15d3c14029b90069b0f 100644

--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

+++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

@@ -11,7 +11,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"

#include "chrome/browser/chromeos/login/test/app_window_waiter.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/extensions/extension_browsertest.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -19,6 +18,7 @@

#include "chromeos/chromeos_switches.h"

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

+#include "components/user_manager/user_manager.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_source.h"

#include "content/public/test/test_utils.h"

@@ -35,7 +35,7 @@ base::FilePath GetTestDemoAppPath() {

}

Profile* WaitForProfile() {

- chromeos::UserManager* user_manager = chromeos::UserManager::Get();

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

if (!user_manager || !user_manager->IsUserLoggedIn()) {

content::WindowedNotificationObserver(

chrome::NOTIFICATION_SESSION_STARTED,