chrome/browser/chromeos/login/screen_locker.cc - Issue 8289021: chromeos: Change all clients of LoginLibrary to use SessionManagerClient.

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/screen_locker.cc

Issue 8289021: chromeos: Change all clients of LoginLibrary to use SessionManagerClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: renamed Created 9 years, 2 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

« no previous file with comments | « chrome/browser/chromeos/login/network_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/signed_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screen_locker.cc

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

index 26a0762fa0ef4a0b8499b9d53174bbd381feccac..3f82096dc3dfaa362009ffcb4212621688d2e63f 100644

--- a/chrome/browser/chromeos/login/screen_locker.cc

+++ b/chrome/browser/chromeos/login/screen_locker.cc

@@ -17,8 +17,9 @@

#include "base/timer.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

-#include "chrome/browser/chromeos/cros/login_library.h"

#include "chrome/browser/chromeos/cros/screen_lock_library.h"

+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

+#include "chrome/browser/chromeos/dbus/session_manager_client.h"

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

#include "chrome/browser/chromeos/input_method/input_method_util.h"

#include "chrome/browser/chromeos/input_method/xkeyboard.h"

@@ -317,8 +318,7 @@ void ScreenLocker::Signout() {

#if defined(TOOLKIT_USES_GTK)

WmIpc::instance()->NotifyAboutSignout();

#endif

- if (CrosLibrary::Get()->EnsureLoaded())

- CrosLibrary::Get()->GetLoginLibrary()->StopSession("");

+ DBusThreadManager::Get()->session_manager_client()->StopSession();

// Don't hide yet the locker because the chrome screen may become visible

// briefly.

« no previous file with comments | « chrome/browser/chromeos/login/network_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/signed_settings.cc » ('j') | no next file with comments »