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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc

Issue 13495003: Add LoginState class to src/chromeos/login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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
Index: chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
index f51a049759a08b4f09fd3df470ce805b6e9287bc..16b8c7756b12c5ae8138a0f94324a69e66919920 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/event_router.h"
@@ -34,6 +33,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/login/login_state.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_source.h"
#include "grit/generated_resources.h"
@@ -310,8 +310,10 @@ void FileManagerEventRouter::ObserveFileSystemEvents() {
NOTREACHED();
return;
}
- if (!chromeos::UserManager::Get()->IsUserLoggedIn())
+ if (!chromeos::LoginState::IsInitialized() ||
+ !chromeos::LoginState::Get()->IsUserLoggedIn()) {
return;
+ }
DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
if (disk_mount_manager) {
« no previous file with comments | « chrome/browser/chromeos/cros/cert_library.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698