| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/keyboard_ui_mus.h" | 5 #include "ash/mus/keyboard_ui_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/keyboard/keyboard_ui_observer.h" | 7 #include "ash/common/keyboard/keyboard_ui_observer.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "services/service_manager/public/cpp/connector.h" | 9 #include "services/service_manager/public/cpp/connector.h" |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 } | 28 } |
| 29 | 29 |
| 30 void KeyboardUIMus::Hide() { | 30 void KeyboardUIMus::Hide() { |
| 31 keyboard_->Hide(); | 31 keyboard_->Hide(); |
| 32 } | 32 } |
| 33 | 33 |
| 34 void KeyboardUIMus::Show() { | 34 void KeyboardUIMus::Show() { |
| 35 keyboard_->Show(); | 35 keyboard_->Show(); |
| 36 } | 36 } |
| 37 | 37 |
| 38 void KeyboardUIMus::ShowInDisplay(int64_t display_id) { |
| 39 // TODO(yhanada): Send display id after adding a display_id argument to |
| 40 // |Keyboard::Show()| in keyboard.mojom. See crbug.com/585253. |
| 41 keyboard_->Show(); |
| 42 } |
| 43 |
| 38 bool KeyboardUIMus::IsEnabled() { | 44 bool KeyboardUIMus::IsEnabled() { |
| 39 return is_enabled_; | 45 return is_enabled_; |
| 40 } | 46 } |
| 41 | 47 |
| 42 void KeyboardUIMus::OnKeyboardStateChanged(bool is_enabled, | 48 void KeyboardUIMus::OnKeyboardStateChanged(bool is_enabled, |
| 43 bool is_visible, | 49 bool is_visible, |
| 44 uint64_t display_id, | 50 uint64_t display_id, |
| 45 const gfx::Rect& bounds) { | 51 const gfx::Rect& bounds) { |
| 46 if (is_enabled_ == is_enabled) | 52 if (is_enabled_ == is_enabled) |
| 47 return; | 53 return; |
| 48 | 54 |
| 49 is_enabled_ = is_enabled; | 55 is_enabled_ = is_enabled; |
| 50 for (auto& observer : *observers()) | 56 for (auto& observer : *observers()) |
| 51 observer.OnKeyboardEnabledStateChanged(is_enabled); | 57 observer.OnKeyboardEnabledStateChanged(is_enabled); |
| 52 } | 58 } |
| 53 | 59 |
| 54 } // namespace ash | 60 } // namespace ash |
| OLD | NEW |