| Index: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| index 14567a4bf38e9a15163db7a37327105ab6071f8b..094e5ffc174fec991befa5ded82050686f424e69 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
|
| #include "chrome/browser/chromeos/file_manager/app_installer.h"
|
| #include "chrome/browser/chromeos/file_manager/zip_file_creator.h"
|
| -#include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| @@ -36,6 +35,7 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "components/signin/core/browser/profile_oauth2_token_service.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/page_zoom.h"
|
| @@ -63,7 +63,7 @@ apps::AppWindow* GetCurrentAppWindow(ChromeSyncExtensionFunction* function) {
|
|
|
| std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >
|
| GetLoggedInProfileInfoList(content::WebContents* contents) {
|
| - DCHECK(chromeos::UserManager::IsInitialized());
|
| + DCHECK(user_manager::UserManager::IsInitialized());
|
| const std::vector<Profile*>& profiles =
|
| g_browser_process->profile_manager()->GetLoadedProfiles();
|
| std::set<Profile*> original_profiles;
|
| @@ -112,7 +112,7 @@ bool FileBrowserPrivateLogoutUserForReauthenticationFunction::RunSync() {
|
| user_manager::User* user =
|
| chromeos::ProfileHelper::Get()->GetUserByProfile(GetProfile());
|
| if (user) {
|
| - chromeos::UserManager::Get()->SaveUserOAuthStatus(
|
| + user_manager::UserManager::Get()->SaveUserOAuthStatus(
|
| user->email(), user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
|
| }
|
|
|
|
|