| Index: chrome/browser/chromeos/extensions/file_manager/event_router.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
|
| index 2a09dd0d37521183939652066ce376ccf8691925..857694cd20e2575d465c011755ad4ccd979cbf3a 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
|
| @@ -29,6 +29,7 @@
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/common/extensions/api/file_browser_private.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chromeos/login/login_state.h"
|
| @@ -626,9 +627,11 @@ void EventRouter::DispatchDirectoryChangeEvent(
|
| void EventRouter::ShowRemovableDeviceInFileManager(
|
| const base::FilePath& mount_path) {
|
| // Do not attempt to open File Manager while the login is in progress or
|
| - // the screen is locked.
|
| + // the screen is locked and make sure the file manager is opened only for the
|
| + // active user.
|
| if (chromeos::LoginDisplayHostImpl::default_host() ||
|
| - chromeos::ScreenLocker::default_screen_locker())
|
| + chromeos::ScreenLocker::default_screen_locker() ||
|
| + profile_ != ProfileManager::GetActiveUserProfile())
|
| return;
|
|
|
| // According to DCF (Design rule of Camera File system) by JEITA / CP-3461
|
|
|