OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <iostream> | 9 #include <iostream> |
10 #include <string> | 10 #include <string> |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 Shell::GetInstance()->media_delegate()->HandleMediaPlayPause(); | 322 Shell::GetInstance()->media_delegate()->HandleMediaPlayPause(); |
323 return true; | 323 return true; |
324 } | 324 } |
325 | 325 |
326 bool HandleMediaPrevTrack() { | 326 bool HandleMediaPrevTrack() { |
327 Shell::GetInstance()->media_delegate()->HandleMediaPrevTrack(); | 327 Shell::GetInstance()->media_delegate()->HandleMediaPrevTrack(); |
328 return true; | 328 return true; |
329 } | 329 } |
330 | 330 |
331 bool HandlePrintLayerHierarchy() { | 331 bool HandlePrintLayerHierarchy() { |
332 Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); | 332 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); |
333 for (size_t i = 0; i < root_windows.size(); ++i) { | 333 for (size_t i = 0; i < root_windows.size(); ++i) { |
334 ui::PrintLayerHierarchy(root_windows[i]->layer(), | 334 ui::PrintLayerHierarchy( |
335 root_windows[i]->GetLastMouseLocationInRoot()); | 335 root_windows[i]->layer(), |
| 336 root_windows[i]->GetDispatcher()->GetLastMouseLocationInRoot()); |
336 } | 337 } |
337 return true; | 338 return true; |
338 } | 339 } |
339 | 340 |
340 bool HandlePrintViewHierarchy() { | 341 bool HandlePrintViewHierarchy() { |
341 aura::Window* active_window = ash::wm::GetActiveWindow(); | 342 aura::Window* active_window = ash::wm::GetActiveWindow(); |
342 if (!active_window) | 343 if (!active_window) |
343 return true; | 344 return true; |
344 views::Widget* browser_widget = | 345 views::Widget* browser_widget = |
345 views::Widget::GetWidgetForNativeWindow(active_window); | 346 views::Widget::GetWidgetForNativeWindow(active_window); |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
994 keyboard_brightness_control_delegate) { | 995 keyboard_brightness_control_delegate) { |
995 keyboard_brightness_control_delegate_ = | 996 keyboard_brightness_control_delegate_ = |
996 keyboard_brightness_control_delegate.Pass(); | 997 keyboard_brightness_control_delegate.Pass(); |
997 } | 998 } |
998 | 999 |
999 bool AcceleratorController::CanHandleAccelerators() const { | 1000 bool AcceleratorController::CanHandleAccelerators() const { |
1000 return true; | 1001 return true; |
1001 } | 1002 } |
1002 | 1003 |
1003 } // namespace ash | 1004 } // namespace ash |
OLD | NEW |