Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/accelerators/magnifier_key_scroller.h" | 5 #include "ash/accelerators/magnifier_key_scroller.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/key_hold_detector.h" | 7 #include "ash/accelerators/key_hold_detector.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/magnifier/magnification_controller.h" | 9 #include "ash/magnifier/magnification_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "ui/events/event.h" | |
|
tdanderson
2015/05/22 18:29:56
Not sure why you're including this here (and in se
varkha
2015/05/22 22:18:34
Because I have removed #include "ui/events/event.h
tdanderson
2015/05/25 15:00:07
Acknowledged.
| |
| 12 | 13 |
| 13 namespace ash { | 14 namespace ash { |
| 14 namespace { | 15 namespace { |
| 15 bool magnifier_key_scroller_enabled = false; | 16 bool magnifier_key_scroller_enabled = false; |
| 16 } | 17 } |
| 17 | 18 |
| 18 // static | 19 // static |
| 19 bool MagnifierKeyScroller::IsEnabled() { | 20 bool MagnifierKeyScroller::IsEnabled() { |
| 20 bool has_switch = false; | 21 bool has_switch = false; |
| 21 #if defined(OS_CHROMEOS) | 22 #if defined(OS_CHROMEOS) |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 MagnificationController* controller = | 77 MagnificationController* controller = |
| 77 Shell::GetInstance()->magnification_controller(); | 78 Shell::GetInstance()->magnification_controller(); |
| 78 controller->SetScrollDirection(MagnificationController::SCROLL_NONE); | 79 controller->SetScrollDirection(MagnificationController::SCROLL_NONE); |
| 79 } | 80 } |
| 80 | 81 |
| 81 MagnifierKeyScroller::MagnifierKeyScroller() {} | 82 MagnifierKeyScroller::MagnifierKeyScroller() {} |
| 82 | 83 |
| 83 MagnifierKeyScroller::~MagnifierKeyScroller() {} | 84 MagnifierKeyScroller::~MagnifierKeyScroller() {} |
| 84 | 85 |
| 85 } // namespace ash | 86 } // namespace ash |
| OLD | NEW |