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

Unified Diff: chrome/browser/extensions/api/input/input.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/extensions/api/input/input.cc
diff --git a/chrome/browser/extensions/api/input/input.cc b/chrome/browser/extensions/api/input/input.cc
index a3939ad791c08d2eafd7b4bc7fb4f16f08c2cfdf..b9f4b1e03250af450fcbaff5a54080ff019e3050 100644
--- a/chrome/browser/extensions/api/input/input.cc
+++ b/chrome/browser/extensions/api/input/input.cc
@@ -21,7 +21,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "components/user_manager/user_manager.h"
#endif // OS_CHROMEOS
#if defined(USE_ASH)
@@ -177,10 +177,10 @@ bool VirtualKeyboardPrivateOpenSettingsFunction::RunSync() {
#if defined(OS_CHROMEOS)
// Do not try to open language options page if user is not logged in or
// locked.
- if (!chromeos::UserManager::Get()->IsUserLoggedIn() ||
+ if (!user_manager::UserManager::Get()->IsUserLoggedIn() ||
chromeos::UserAddingScreen::Get()->IsRunning() ||
(chromeos::ScreenLocker::default_screen_locker() &&
- chromeos::ScreenLocker::default_screen_locker()->locked()))
+ chromeos::ScreenLocker::default_screen_locker()->locked()))
return true;
#endif // OS_CHROMEOS

Powered by Google App Engine
This is Rietveld 408576698