Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5803)

Unified Diff: chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
index d5327d66e3b07aaf57152bdf94a41898100a3a27..fa3c395251543d9508f9b1d6a8e75942e1400e1f 100644
--- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
@@ -12,11 +12,11 @@
#include "base/memory/weak_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/debug_daemon_client.h"
+#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
const char kNotAvailable[] = "<not available>";
@@ -136,9 +136,8 @@ void DebugDaemonLogSource::OnGetUserLogFiles(
SystemLogsResponse* response = new SystemLogsResponse;
std::vector<Profile*> last_used = ProfileManager::GetLastOpenedProfiles();
- if (last_used.empty() &&
- chromeos::UserManager::IsInitialized() &&
- chromeos::UserManager::Get()->IsLoggedInAsKioskApp()) {
+ if (last_used.empty() && user_manager::UserManager::IsInitialized() &&
+ user_manager::UserManager::Get()->IsLoggedInAsKioskApp()) {
// Use the kiosk app profile explicitly because kiosk session does not
// open any browsers thus ProfileManager::GetLastOpenedProfiles returns
// an empty |last_used|.

Powered by Google App Engine
This is Rietveld 408576698