| 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/bridge/wm_shelf_mus.h" | 5 #include "ash/mus/bridge/wm_shelf_mus.h" |
| 6 | 6 |
| 7 #include "ash/mus/bridge/wm_window_mus.h" | 7 #include "ash/mus/bridge/wm_window_mus.h" |
| 8 #include "ash/mus/shelf_layout_manager.h" | 8 #include "ash/mus/shelf_layout_manager.h" |
| 9 #include "services/ui/public/cpp/window.h" | 9 #include "services/ui/public/cpp/window.h" |
| 10 | 10 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 } | 130 } |
| 131 | 131 |
| 132 void WmShelfMus::RemoveObserver(WmShelfObserver* observer) { | 132 void WmShelfMus::RemoveObserver(WmShelfObserver* observer) { |
| 133 observers_.RemoveObserver(observer); | 133 observers_.RemoveObserver(observer); |
| 134 } | 134 } |
| 135 | 135 |
| 136 void WmShelfMus::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) { | 136 void WmShelfMus::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) { |
| 137 NOTIMPLEMENTED(); | 137 NOTIMPLEMENTED(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 ShelfLockingManager* WmShelfMus::GetShelfLockingManagerForTesting() { |
| 141 NOTIMPLEMENTED(); |
| 142 return nullptr; |
| 143 } |
| 144 |
| 140 } // namespace mus | 145 } // namespace mus |
| 141 } // namespace ash | 146 } // namespace ash |
| OLD | NEW |