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

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

Issue 118543002: Move sticky keys files to their own directory and rename to StickyKeysController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update ash.gyp 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/sticky_keys_unittest.cc ('k') | no next file » | 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 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include "ash/autoclick/autoclick_controller.h" 7 #include "ash/autoclick/autoclick_controller.h"
8 #include "ash/high_contrast/high_contrast_controller.h" 8 #include "ash/high_contrast/high_contrast_controller.h"
9 #include "ash/metrics/user_metrics_recorder.h" 9 #include "ash/metrics/user_metrics_recorder.h"
10 #include "ash/session_state_delegate.h" 10 #include "ash/session_state_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/sticky_keys/sticky_keys_controller.h"
12 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
13 #include "ash/wm/event_rewriter_event_filter.h" 14 #include "ash/wm/event_rewriter_event_filter.h"
14 #include "ash/wm/sticky_keys.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"
22 #include "base/values.h" 22 #include "base/values.h"
23 #include "chrome/browser/accessibility/accessibility_extension_api.h" 23 #include "chrome/browser/accessibility/accessibility_extension_api.h"
24 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 432
433 const bool enabled = 433 const bool enabled =
434 profile_->GetPrefs()->GetBoolean(prefs::kStickyKeysEnabled); 434 profile_->GetPrefs()->GetBoolean(prefs::kStickyKeysEnabled);
435 435
436 if (sticky_keys_enabled_ == enabled) 436 if (sticky_keys_enabled_ == enabled)
437 return; 437 return;
438 438
439 sticky_keys_enabled_ = enabled; 439 sticky_keys_enabled_ = enabled;
440 #if defined(USE_ASH) 440 #if defined(USE_ASH)
441 // Sticky keys is implemented only in ash. 441 // Sticky keys is implemented only in ash.
442 ash::Shell::GetInstance()->sticky_keys()->Enable(enabled); 442 ash::Shell::GetInstance()->sticky_keys_controller()->Enable(enabled);
443 #endif 443 #endif
444 } 444 }
445 445
446 void AccessibilityManager::EnableSpokenFeedback( 446 void AccessibilityManager::EnableSpokenFeedback(
447 bool enabled, 447 bool enabled,
448 ash::AccessibilityNotificationVisibility notify) { 448 ash::AccessibilityNotificationVisibility notify) {
449 if (!profile_) 449 if (!profile_)
450 return; 450 return;
451 451
452 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( 452 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 event_router()->UnregisterObserver(this); 954 event_router()->UnregisterObserver(this);
955 } 955 }
956 } 956 }
957 957
958 void AccessibilityManager::PlaySound(int sound_key) const { 958 void AccessibilityManager::PlaySound(int sound_key) const {
959 if (system_sounds_enabled_) 959 if (system_sounds_enabled_)
960 media::SoundsManager::Get()->Play(sound_key); 960 media::SoundsManager::Get()->Play(sound_key);
961 } 961 }
962 962
963 } // namespace chromeos 963 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/sticky_keys_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698