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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/session/session_state_observer.h" 10 #include "ash/session/session_state_observer.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 void EnableSystemSounds(bool system_sounds_enabled); 218 void EnableSystemSounds(bool system_sounds_enabled);
219 219
220 // Initiates play of shutdown sound and returns it's duration. 220 // Initiates play of shutdown sound and returns it's duration.
221 base::TimeDelta PlayShutdownSound(); 221 base::TimeDelta PlayShutdownSound();
222 222
223 // Injects ChromeVox scripts into given |render_view_host|. 223 // Injects ChromeVox scripts into given |render_view_host|.
224 void InjectChromeVox(content::RenderViewHost* render_view_host); 224 void InjectChromeVox(content::RenderViewHost* render_view_host);
225 225
226 // Register a callback to be notified when the status of an accessibility 226 // Register a callback to be notified when the status of an accessibility
227 // option changes. 227 // option changes.
228 scoped_ptr<AccessibilityStatusSubscription> RegisterCallback( 228 std::unique_ptr<AccessibilityStatusSubscription> RegisterCallback(
229 const AccessibilityStatusCallback& cb); 229 const AccessibilityStatusCallback& cb);
230 230
231 // Notify registered callbacks of a status change in an accessibility setting. 231 // Notify registered callbacks of a status change in an accessibility setting.
232 void NotifyAccessibilityStatusChanged( 232 void NotifyAccessibilityStatusChanged(
233 AccessibilityStatusEventDetails& details); 233 AccessibilityStatusEventDetails& details);
234 234
235 // Notify accessibility when locale changes occur. 235 // Notify accessibility when locale changes occur.
236 void OnLocaleChanged(); 236 void OnLocaleChanged();
237 237
238 // Plays an earcon. Earcons are brief and distinctive sounds that indicate 238 // Plays an earcon. Earcons are brief and distinctive sounds that indicate
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 void UpdateVirtualKeyboardFromPref(); 282 void UpdateVirtualKeyboardFromPref();
283 void UpdateCaretHighlightFromPref(); 283 void UpdateCaretHighlightFromPref();
284 void UpdateCursorHighlightFromPref(); 284 void UpdateCursorHighlightFromPref();
285 void UpdateFocusHighlightFromPref(); 285 void UpdateFocusHighlightFromPref();
286 void UpdateSelectToSpeakFromPref(); 286 void UpdateSelectToSpeakFromPref();
287 void UpdateSwitchAccessFromPref(); 287 void UpdateSwitchAccessFromPref();
288 void UpdateAccessibilityHighlightingFromPrefs(); 288 void UpdateAccessibilityHighlightingFromPrefs();
289 289
290 void CheckBrailleState(); 290 void CheckBrailleState();
291 void ReceiveBrailleDisplayState( 291 void ReceiveBrailleDisplayState(
292 scoped_ptr<extensions::api::braille_display_private::DisplayState> state); 292 std::unique_ptr<extensions::api::braille_display_private::DisplayState>
293 state);
293 void UpdateBrailleImeState(); 294 void UpdateBrailleImeState();
294 295
295 void SetProfile(Profile* profile); 296 void SetProfile(Profile* profile);
296 297
297 void UpdateChromeOSAccessibilityHistograms(); 298 void UpdateChromeOSAccessibilityHistograms();
298 299
299 // content::NotificationObserver 300 // content::NotificationObserver
300 void Observe(int type, 301 void Observe(int type,
301 const content::NotificationSource& source, 302 const content::NotificationSource& source,
302 const content::NotificationDetails& details) override; 303 const content::NotificationDetails& details) override;
(...skipping 20 matching lines...) Expand all
323 324
324 // Profile which has the current a11y context. 325 // Profile which has the current a11y context.
325 Profile* profile_; 326 Profile* profile_;
326 327
327 // Profile which ChromeVox is currently loaded to. If NULL, ChromeVox is not 328 // Profile which ChromeVox is currently loaded to. If NULL, ChromeVox is not
328 // loaded to any profile. 329 // loaded to any profile.
329 bool chrome_vox_loaded_on_lock_screen_; 330 bool chrome_vox_loaded_on_lock_screen_;
330 bool chrome_vox_loaded_on_user_screen_; 331 bool chrome_vox_loaded_on_user_screen_;
331 332
332 content::NotificationRegistrar notification_registrar_; 333 content::NotificationRegistrar notification_registrar_;
333 scoped_ptr<PrefChangeRegistrar> pref_change_registrar_; 334 std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
334 scoped_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_; 335 std::unique_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_;
335 scoped_ptr<ash::ScopedSessionStateObserver> session_state_observer_; 336 std::unique_ptr<ash::ScopedSessionStateObserver> session_state_observer_;
336 337
337 PrefHandler large_cursor_pref_handler_; 338 PrefHandler large_cursor_pref_handler_;
338 PrefHandler spoken_feedback_pref_handler_; 339 PrefHandler spoken_feedback_pref_handler_;
339 PrefHandler high_contrast_pref_handler_; 340 PrefHandler high_contrast_pref_handler_;
340 PrefHandler autoclick_pref_handler_; 341 PrefHandler autoclick_pref_handler_;
341 PrefHandler autoclick_delay_pref_handler_; 342 PrefHandler autoclick_delay_pref_handler_;
342 PrefHandler virtual_keyboard_pref_handler_; 343 PrefHandler virtual_keyboard_pref_handler_;
343 PrefHandler caret_highlight_pref_handler_; 344 PrefHandler caret_highlight_pref_handler_;
344 PrefHandler cursor_highlight_pref_handler_; 345 PrefHandler cursor_highlight_pref_handler_;
345 PrefHandler focus_highlight_pref_handler_; 346 PrefHandler focus_highlight_pref_handler_;
(...skipping 21 matching lines...) Expand all
367 368
368 AccessibilityStatusCallbackList callback_list_; 369 AccessibilityStatusCallbackList callback_list_;
369 370
370 bool braille_display_connected_; 371 bool braille_display_connected_;
371 ScopedObserver<extensions::api::braille_display_private::BrailleController, 372 ScopedObserver<extensions::api::braille_display_private::BrailleController,
372 AccessibilityManager> scoped_braille_observer_; 373 AccessibilityManager> scoped_braille_observer_;
373 374
374 bool braille_ime_current_; 375 bool braille_ime_current_;
375 376
376 ChromeVoxPanel* chromevox_panel_; 377 ChromeVoxPanel* chromevox_panel_;
377 scoped_ptr<ChromeVoxPanelWidgetObserver> chromevox_panel_widget_observer_; 378 std::unique_ptr<ChromeVoxPanelWidgetObserver>
379 chromevox_panel_widget_observer_;
378 380
379 std::string keyboard_listener_extension_id_; 381 std::string keyboard_listener_extension_id_;
380 bool keyboard_listener_capture_; 382 bool keyboard_listener_capture_;
381 383
382 // Listen to extension unloaded notifications. 384 // Listen to extension unloaded notifications.
383 ScopedObserver<extensions::ExtensionRegistry, 385 ScopedObserver<extensions::ExtensionRegistry,
384 extensions::ExtensionRegistryObserver> 386 extensions::ExtensionRegistryObserver>
385 extension_registry_observer_; 387 extension_registry_observer_;
386 388
387 scoped_ptr<AccessibilityHighlightManager> accessibility_highlight_manager_; 389 std::unique_ptr<AccessibilityHighlightManager>
390 accessibility_highlight_manager_;
388 391
389 base::WeakPtrFactory<AccessibilityManager> weak_ptr_factory_; 392 base::WeakPtrFactory<AccessibilityManager> weak_ptr_factory_;
390 393
391 DISALLOW_COPY_AND_ASSIGN(AccessibilityManager); 394 DISALLOW_COPY_AND_ASSIGN(AccessibilityManager);
392 }; 395 };
393 396
394 } // namespace chromeos 397 } // namespace chromeos
395 398
396 #endif // CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_ 399 #endif // CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698