| 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 "ui/ozone/public/input_controller.h" | 5 #include "ui/ozone/public/input_controller.h" | 
| 6 | 6 | 
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" | 
| 8 #include "base/logging.h" | 8 #include "base/logging.h" | 
| 9 | 9 | 
| 10 namespace ui { | 10 namespace ui { | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 35   void SetThreeFingerClick(bool enabled) override; | 35   void SetThreeFingerClick(bool enabled) override; | 
| 36   void SetTapDragging(bool enabled) override; | 36   void SetTapDragging(bool enabled) override; | 
| 37   void SetNaturalScroll(bool enabled) override; | 37   void SetNaturalScroll(bool enabled) override; | 
| 38   void SetMouseSensitivity(int value) override; | 38   void SetMouseSensitivity(int value) override; | 
| 39   void SetPrimaryButtonRight(bool right) override; | 39   void SetPrimaryButtonRight(bool right) override; | 
| 40   void SetTapToClickPaused(bool state) override; | 40   void SetTapToClickPaused(bool state) override; | 
| 41   void GetTouchDeviceStatus(const GetTouchDeviceStatusReply& reply) override; | 41   void GetTouchDeviceStatus(const GetTouchDeviceStatusReply& reply) override; | 
| 42   void GetTouchEventLog(const base::FilePath& out_dir, | 42   void GetTouchEventLog(const base::FilePath& out_dir, | 
| 43                         const GetTouchEventLogReply& reply) override; | 43                         const GetTouchEventLogReply& reply) override; | 
| 44   void SetInternalTouchpadEnabled(bool enabled) override; | 44   void SetInternalTouchpadEnabled(bool enabled) override; | 
|  | 45   bool IsInternalTouchpadEnabled() const override; | 
| 45   void SetInternalKeyboardFilter(bool enable_filter, | 46   void SetInternalKeyboardFilter(bool enable_filter, | 
| 46                                  std::vector<DomCode> allowed_keys) override; | 47                                  std::vector<DomCode> allowed_keys) override; | 
| 47 | 48 | 
| 48  private: | 49  private: | 
| 49   DISALLOW_COPY_AND_ASSIGN(StubInputController); | 50   DISALLOW_COPY_AND_ASSIGN(StubInputController); | 
| 50 }; | 51 }; | 
| 51 | 52 | 
| 52 StubInputController::StubInputController() { | 53 StubInputController::StubInputController() { | 
| 53 } | 54 } | 
| 54 | 55 | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 127 } | 128 } | 
| 128 | 129 | 
| 129 void StubInputController::GetTouchEventLog(const base::FilePath& out_dir, | 130 void StubInputController::GetTouchEventLog(const base::FilePath& out_dir, | 
| 130                                            const GetTouchEventLogReply& reply) { | 131                                            const GetTouchEventLogReply& reply) { | 
| 131   reply.Run(make_scoped_ptr(new std::vector<base::FilePath>)); | 132   reply.Run(make_scoped_ptr(new std::vector<base::FilePath>)); | 
| 132 } | 133 } | 
| 133 | 134 | 
| 134 void StubInputController::SetInternalTouchpadEnabled(bool enabled) { | 135 void StubInputController::SetInternalTouchpadEnabled(bool enabled) { | 
| 135 } | 136 } | 
| 136 | 137 | 
|  | 138 bool StubInputController::IsInternalTouchpadEnabled() const { | 
|  | 139   return false; | 
|  | 140 } | 
|  | 141 | 
| 137 void StubInputController::SetInternalKeyboardFilter( | 142 void StubInputController::SetInternalKeyboardFilter( | 
| 138     bool enable_filter, | 143     bool enable_filter, | 
| 139     std::vector<DomCode> allowed_keys) { | 144     std::vector<DomCode> allowed_keys) { | 
| 140 } | 145 } | 
| 141 | 146 | 
| 142 }  // namespace | 147 }  // namespace | 
| 143 | 148 | 
| 144 scoped_ptr<InputController> CreateStubInputController() { | 149 scoped_ptr<InputController> CreateStubInputController() { | 
| 145   return make_scoped_ptr(new StubInputController); | 150   return make_scoped_ptr(new StubInputController); | 
| 146 } | 151 } | 
| 147 | 152 | 
| 148 }  // namespace ui | 153 }  // namespace ui | 
| OLD | NEW | 
|---|