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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/event_router.cc

Issue 115733007: Fix non-otr profile's file manager being launched in guest mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/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

Powered by Google App Engine
This is Rietveld 408576698