| 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_shell_mus.h" | 5 #include "ash/mus/bridge/wm_shell_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 9 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| 10 #include "ash/common/accelerators/accelerator_controller.h" | 10 #include "ash/common/accelerators/accelerator_controller.h" |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 // TODO(mash): implement http://crbug.com/622480. | 197 // TODO(mash): implement http://crbug.com/622480. |
| 198 NOTIMPLEMENTED(); | 198 NOTIMPLEMENTED(); |
| 199 return false; | 199 return false; |
| 200 } | 200 } |
| 201 | 201 |
| 202 void WmShellMus::SetDisplayWorkAreaInsets(WmWindow* window, | 202 void WmShellMus::SetDisplayWorkAreaInsets(WmWindow* window, |
| 203 const gfx::Insets& insets) { | 203 const gfx::Insets& insets) { |
| 204 window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets); | 204 window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets); |
| 205 } | 205 } |
| 206 | 206 |
| 207 bool WmShellMus::IsPinned() { | |
| 208 // TODO: http://crbug.com/622486. | |
| 209 NOTIMPLEMENTED(); | |
| 210 return false; | |
| 211 } | |
| 212 | |
| 213 void WmShellMus::SetPinnedWindow(WmWindow* window) { | |
| 214 // TODO: http://crbug.com/622486. | |
| 215 NOTIMPLEMENTED(); | |
| 216 } | |
| 217 | |
| 218 void WmShellMus::LockCursor() { | 207 void WmShellMus::LockCursor() { |
| 219 // TODO: http::/crbug.com/637853 | 208 // TODO: http::/crbug.com/637853 |
| 220 NOTIMPLEMENTED(); | 209 NOTIMPLEMENTED(); |
| 221 } | 210 } |
| 222 | 211 |
| 223 void WmShellMus::UnlockCursor() { | 212 void WmShellMus::UnlockCursor() { |
| 224 // TODO: http::/crbug.com/637853 | 213 // TODO: http::/crbug.com/637853 |
| 225 NOTIMPLEMENTED(); | 214 NOTIMPLEMENTED(); |
| 226 } | 215 } |
| 227 | 216 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 accelerator_controller_registrar_ = | 370 accelerator_controller_registrar_ = |
| 382 base ::MakeUnique<AcceleratorControllerRegistrar>( | 371 base ::MakeUnique<AcceleratorControllerRegistrar>( |
| 383 window_manager_, accelerator_namespace_id); | 372 window_manager_, accelerator_namespace_id); |
| 384 return base::MakeUnique<AcceleratorController>( | 373 return base::MakeUnique<AcceleratorController>( |
| 385 accelerator_controller_delegate_.get(), | 374 accelerator_controller_delegate_.get(), |
| 386 accelerator_controller_registrar_.get()); | 375 accelerator_controller_registrar_.get()); |
| 387 } | 376 } |
| 388 | 377 |
| 389 } // namespace mus | 378 } // namespace mus |
| 390 } // namespace ash | 379 } // namespace ash |
| OLD | NEW |