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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.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/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 64172f4e1a75590ad326c4bba5a8b5c42d1a039a..ebf9bb26421216b76e18cdf1d3bb41d11b73675e 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -118,14 +118,10 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
return chromeos::AccessibilityManager::Get()->IsAutoclickEnabled();
}
- virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE {
- Profile* profile = ProfileManager::GetActiveUserProfileOrOffTheRecord();
- if (!profile)
- return false;
-
- PrefService* user_pref_service = profile->GetPrefs();
- return user_pref_service && user_pref_service->GetBoolean(
- prefs::kShouldAlwaysShowAccessibilityMenu);
+ virtual bool ShouldShowAccessibilityMenu() const OVERRIDE {
+ DCHECK(chromeos::AccessibilityManager::Get());
+ return chromeos::AccessibilityManager::Get()->
+ ShouldShowAccessibilityMenu();
}
virtual void SilenceSpokenFeedback() const OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698