chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

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/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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/user.cc ('K') | « chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

index 2d1bc91d1962fd3f40f46c3fc96607512582c53d..bf577ee90d49047d9eb37a208513b21b27dd0822 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

@@ -2,7 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/session_state_delegate.h"

+#include "ash/session/session_state_delegate.h"

+#include "ash/session/user_info.h"

#include "ash/shell.h"

#include "ash/system/system_notifier.h"

#include "ash/test/ash_test_base.h"

@@ -64,7 +65,10 @@ class MultiUserNotificationBlockerChromeOSTest

}

const std::string GetDefaultUserId() {

- return ash::Shell::GetInstance()->session_state_delegate()->GetUserID(0);

+ return ash::Shell::GetInstance()

+ ->session_state_delegate()

+ ->GetUserInfo(0)

+ ->GetID();

}

const message_center::NotificationBlocker* blocker() {