| 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
|
|
|
|
|