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

Unified Diff: chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc

Issue 102483006: Getting rid of GetDefaultProfile & fixing multi user issues with accessibility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit test 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/extensions/api/braille_display_private/braille_display_private_api.cc
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc
index b16be53fae7ce7f5afdf5cbd8eade4c8bb50b80f..f72fd3caf918c575123af8ead81354f348ebf5a7 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc
@@ -82,10 +82,14 @@ bool BrailleDisplayPrivateAPI::IsProfileActive() {
Profile* active_profile;
chromeos::ScreenLocker* screen_locker =
chromeos::ScreenLocker::default_screen_locker();
- if (screen_locker && screen_locker->locked())
+ if (screen_locker && screen_locker->locked()) {
active_profile = chromeos::ProfileHelper::GetSigninProfile();
- else
- active_profile = ProfileManager::GetDefaultProfile();
+ } else {
+ // Since we are creating one instance per profile / user, we should be fine
+ // comparing against the active user. That said - if we ever change that,
+ // this code will need to be changed.
+ active_profile = ProfileManager::GetActiveUserProfile();
+ }
return profile_->IsSameProfile(active_profile);
#else // !defined(OS_CHROMEOS)
return true;

Powered by Google App Engine
This is Rietveld 408576698