trunk/src/chrome/browser/chromeos/accessibility/accessibility_manager.cc - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « trunk/src/chrome/browser/chromeos/accessibility/accessibility_manager.h ('k') | trunk/src/chrome/browser/chromeos/accessibility/magnification_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

6	6

7 #include "ash/audio/sounds.h"	7 #include "ash/audio/sounds.h"

8 #include "ash/autoclick/autoclick_controller.h"	8 #include "ash/autoclick/autoclick_controller.h"

9 #include "ash/high_contrast/high_contrast_controller.h"	9 #include "ash/high_contrast/high_contrast_controller.h"

10 #include "ash/metrics/user_metrics_recorder.h"	10 #include "ash/metrics/user_metrics_recorder.h"

11 #include "ash/session/session_state_delegate.h"	11 #include "ash/session_state_delegate.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

13 #include "ash/sticky_keys/sticky_keys_controller.h"	13 #include "ash/sticky_keys/sticky_keys_controller.h"

14 #include "ash/system/tray/system_tray_notifier.h"	14 #include "ash/system/tray/system_tray_notifier.h"

15 #include "base/memory/scoped_ptr.h"	15 #include "base/memory/scoped_ptr.h"

16 #include "base/memory/singleton.h"	16 #include "base/memory/singleton.h"

17 #include "base/metrics/histogram.h"	17 #include "base/metrics/histogram.h"

18 #include "base/path_service.h"	18 #include "base/path_service.h"

19 #include "base/prefs/pref_member.h"	19 #include "base/prefs/pref_member.h"

20 #include "base/prefs/pref_service.h"	20 #include "base/prefs/pref_service.h"

21 #include "base/time/time.h"	21 #include "base/time/time.h"

(...skipping 988 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1010 chrome_vox_loaded_on_lock_screen_;	1010 chrome_vox_loaded_on_lock_screen_;

1011 }	1011 }

1012	1012

1013 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) {	1013 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) {

1014 // Do any teardown work needed immediately after ChromeVox actually unloads.	1014 // Do any teardown work needed immediately after ChromeVox actually unloads.

1015 if (system_sounds_enabled_)	1015 if (system_sounds_enabled_)

1016 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);	1016 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);

1017 }	1017 }

1018	1018

1019 } // namespace chromeos	1019 } // namespace chromeos

OLD	NEW