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

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.h

Issue 2212863002: Factor the extension loading code out of AccessibilityManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no_load_chromevox
Patch Set: Fix code that runs on OnUnload Created 4 years, 3 months 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/accessibility/accessibility_manager.h
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
index e35e5d37ae7e51986a83fb5417456e6afd9d2d32..7a8f8b6766931eb620a8d49b719fb1e5c8bb0f2a 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -34,6 +34,7 @@ class Profile;
namespace chromeos {
+class AccessibilityExtensionLoader;
class AccessibilityHighlightManager;
enum AccessibilityNotificationType {
@@ -286,13 +287,8 @@ class AccessibilityManager
~AccessibilityManager() override;
private:
- void LoadChromeVox();
- void LoadChromeVoxToUserScreen(const base::Closure& done_cb);
- void LoadChromeVoxToLockScreen(const base::Closure& done_cb);
- void UnloadChromeVox();
- void UnloadChromeVoxFromLockScreen();
- void PostLoadChromeVox(Profile* profile);
- void PostUnloadChromeVox(Profile* profile);
+ void PostLoadChromeVox();
+ void PostUnloadChromeVox();
void UpdateLargeCursorFromPref();
void UpdateStickyKeysFromPref();
@@ -347,11 +343,6 @@ class AccessibilityManager
// Profile which has the current a11y context.
Profile* profile_;
- // Profile which ChromeVox is currently loaded to. If NULL, ChromeVox is not
- // loaded to any profile.
- bool chrome_vox_loaded_on_lock_screen_;
- bool chrome_vox_loaded_on_user_screen_;
-
content::NotificationRegistrar notification_registrar_;
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
std::unique_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_;
@@ -413,6 +404,8 @@ class AccessibilityManager
std::unique_ptr<AccessibilityHighlightManager>
accessibility_highlight_manager_;
+ std::unique_ptr<AccessibilityExtensionLoader> chromevox_loader_;
+
base::WeakPtrFactory<AccessibilityManager> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(AccessibilityManager);

Powered by Google App Engine
This is Rietveld 408576698