OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/login/wizard_accessibility_helper.h" | 5 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/chromeos/accessibility_util.h" | 10 #include "chrome/browser/chromeos/accessibility_util.h" |
11 #include "chrome/browser/extensions/extension_accessibility_api.h" | 11 #include "chrome/browser/extensions/extension_accessibility_api.h" |
12 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
16 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
17 #include "content/public/browser/notification_registrar.h" | 17 #include "content/public/browser/notification_registrar.h" |
18 #include "content/public/browser/notification_service.h" | 18 #include "content/public/browser/notification_service.h" |
19 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
20 #include "ui/base/l10n/l10n_util.h" | 20 #include "ui/base/l10n/l10n_util.h" |
21 #include "views/accelerator.h" | 21 #include "ui/base/models/accelerator.h" |
22 #include "views/view.h" | 22 #include "views/view.h" |
23 | 23 |
24 namespace chromeos { | 24 namespace chromeos { |
25 | 25 |
26 scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_; | 26 scoped_ptr<ui::Accelerator> WizardAccessibilityHelper::accelerator_; |
27 | 27 |
28 // static | 28 // static |
29 views::Accelerator WizardAccessibilityHelper::GetAccelerator() { | 29 ui::Accelerator WizardAccessibilityHelper::GetAccelerator() { |
30 if (!WizardAccessibilityHelper::accelerator_.get()) | 30 if (!WizardAccessibilityHelper::accelerator_.get()) |
31 WizardAccessibilityHelper::accelerator_.reset( | 31 WizardAccessibilityHelper::accelerator_.reset( |
32 new views::Accelerator(ui::VKEY_Z, false, true, true)); | 32 new ui::Accelerator(ui::VKEY_Z, false, true, true)); |
33 return *(WizardAccessibilityHelper::accelerator_.get()); | 33 return *(WizardAccessibilityHelper::accelerator_.get()); |
34 } | 34 } |
35 | 35 |
36 // static | 36 // static |
37 WizardAccessibilityHelper* WizardAccessibilityHelper::GetInstance() { | 37 WizardAccessibilityHelper* WizardAccessibilityHelper::GetInstance() { |
38 return Singleton<WizardAccessibilityHelper>::get(); | 38 return Singleton<WizardAccessibilityHelper>::get(); |
39 } | 39 } |
40 | 40 |
41 WizardAccessibilityHelper::WizardAccessibilityHelper() { | 41 WizardAccessibilityHelper::WizardAccessibilityHelper() { |
42 accessibility_handler_.reset(new WizardAccessibilityHandler()); | 42 accessibility_handler_.reset(new WizardAccessibilityHandler()); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 if (registered_notifications_) | 110 if (registered_notifications_) |
111 UnregisterNotifications(); | 111 UnregisterNotifications(); |
112 } | 112 } |
113 } | 113 } |
114 | 114 |
115 void WizardAccessibilityHelper::SetAccessibilityEnabled(bool enabled) { | 115 void WizardAccessibilityHelper::SetAccessibilityEnabled(bool enabled) { |
116 accessibility::EnableAccessibility(enabled, NULL); | 116 accessibility::EnableAccessibility(enabled, NULL); |
117 } | 117 } |
118 | 118 |
119 } // namespace chromeos | 119 } // namespace chromeos |
OLD | NEW |