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

Unified Diff: chrome/browser/extensions/extension_system.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/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index df52ac05429cc415608215860150c075b7cec0c2..3875d8fd09e7a9910a7d068dd6c8fc8393d285c4 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -50,8 +50,8 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/app_mode/app_mode_utils.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
#include "chromeos/chromeos_switches.h"
+#include "chromeos/login/login_state.h"
#endif
using content::BrowserThread;
@@ -164,7 +164,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
bool skip_session_extensions = false;
#if defined(OS_CHROMEOS)
// Skip loading session extensions if we are not in a user session.
- skip_session_extensions = !chromeos::UserManager::Get()->IsUserLoggedIn();
+ skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn();
if (!chrome::IsRunningInForcedAppMode()) {
extension_service_->component_loader()->AddDefaultComponentExtensions(
skip_session_extensions);
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/google_apis/auth_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698