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

Side by Side Diff: chrome/browser/chromeos/login/wizard_accessibility_helper.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util-inl.h" 9 #include "base/stl_util-inl.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.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/notification_registrar.h" 15 #include "chrome/common/notification_registrar.h"
16 #include "chrome/common/notification_service.h" 16 #include "chrome/common/notification_service.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "views/accelerator.h" 19 #include "views/accelerator.h"
20 #include "views/view.h" 20 #include "views/view.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_; 24 scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_;
25 25
26 // static 26 // static
27 views::Accelerator WizardAccessibilityHelper::GetAccelerator() { 27 views::Accelerator WizardAccessibilityHelper::GetAccelerator() {
28 if (!WizardAccessibilityHelper::accelerator_.get()) 28 if (!WizardAccessibilityHelper::accelerator_.get())
29 WizardAccessibilityHelper::accelerator_.reset( 29 WizardAccessibilityHelper::accelerator_.reset(
30 new views::Accelerator(app::VKEY_Z, false, true, true)); 30 new views::Accelerator(ui::VKEY_Z, false, true, true));
31 return *(WizardAccessibilityHelper::accelerator_.get()); 31 return *(WizardAccessibilityHelper::accelerator_.get());
32 } 32 }
33 33
34 // static 34 // static
35 WizardAccessibilityHelper* WizardAccessibilityHelper::GetInstance() { 35 WizardAccessibilityHelper* WizardAccessibilityHelper::GetInstance() {
36 return Singleton<WizardAccessibilityHelper>::get(); 36 return Singleton<WizardAccessibilityHelper>::get();
37 } 37 }
38 38
39 WizardAccessibilityHelper::WizardAccessibilityHelper() { 39 WizardAccessibilityHelper::WizardAccessibilityHelper() {
40 accessibility_handler_.reset(new WizardAccessibilityHandler()); 40 accessibility_handler_.reset(new WizardAccessibilityHandler());
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 if ((*iter).first == view_tree) { 146 if ((*iter).first == view_tree) {
147 view_exists = true; 147 view_exists = true;
148 break; 148 break;
149 } 149 }
150 } 150 }
151 if (!view_exists) 151 if (!view_exists)
152 views_buffer_[view_tree] = false; 152 views_buffer_[view_tree] = false;
153 } 153 }
154 154
155 } // namespace chromeos 155 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698