chrome/browser/chromeos/login/base_login_display_host.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/base_login_display_host.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/enterprise_extension_observer.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ceff679a426f4e0dca8527623ac675d202fecd1e..15251532238d3e7d50a1954bc0f385623ec85fa9 100644

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

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

@@ -11,7 +11,8 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_shutdown.h"

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

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

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

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

#include "chrome/browser/chromeos/customization_document.h"

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

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

@@ -349,8 +350,8 @@ void ShowLoginWizard(const std::string& first_screen_name,

display_host->StartWizard(first_screen_name, GURL());

chromeos::LoginUtils::Get()->PrewarmAuthentication();

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

- chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();

+ chromeos::DBusThreadManager::Get()->session_manager_client()

+ ->EmitLoginPromptReady();

// Set initial timezone if specified by customization.

const std::string timezone_name = startup_manifest->initial_timezone();