| 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 19 matching lines...) Expand all Loading... |
| 30 #include "ash/session_state_delegate.h" | 30 #include "ash/session_state_delegate.h" |
| 31 #include "ash/shelf/shelf_widget.h" | 31 #include "ash/shelf/shelf_widget.h" |
| 32 #include "ash/shell.h" | 32 #include "ash/shell.h" |
| 33 #include "ash/shell_delegate.h" | 33 #include "ash/shell_delegate.h" |
| 34 #include "ash/shell_window_ids.h" | 34 #include "ash/shell_window_ids.h" |
| 35 #include "ash/system/brightness/brightness_control_delegate.h" | 35 #include "ash/system/brightness/brightness_control_delegate.h" |
| 36 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" | 36 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" |
| 37 #include "ash/system/status_area_widget.h" | 37 #include "ash/system/status_area_widget.h" |
| 38 #include "ash/system/tray/system_tray.h" | 38 #include "ash/system/tray/system_tray.h" |
| 39 #include "ash/system/tray/system_tray_delegate.h" | 39 #include "ash/system/tray/system_tray_delegate.h" |
| 40 #include "ash/system/tray/system_tray_notifier.h" |
| 40 #include "ash/system/web_notification/web_notification_tray.h" | 41 #include "ash/system/web_notification/web_notification_tray.h" |
| 41 #include "ash/touch/touch_observer_hud.h" | 42 #include "ash/touch/touch_observer_hud.h" |
| 42 #include "ash/volume_control_delegate.h" | 43 #include "ash/volume_control_delegate.h" |
| 43 #include "ash/wm/partial_screenshot_view.h" | 44 #include "ash/wm/partial_screenshot_view.h" |
| 44 #include "ash/wm/power_button_controller.h" | 45 #include "ash/wm/power_button_controller.h" |
| 45 #include "ash/wm/property_util.h" | 46 #include "ash/wm/property_util.h" |
| 46 #include "ash/wm/window_cycle_controller.h" | 47 #include "ash/wm/window_cycle_controller.h" |
| 47 #include "ash/wm/window_util.h" | 48 #include "ash/wm/window_util.h" |
| 48 #include "ash/wm/workspace/snap_sizer.h" | 49 #include "ash/wm/workspace/snap_sizer.h" |
| 49 #include "base/bind.h" | 50 #include "base/bind.h" |
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 return HandleCrosh(); | 544 return HandleCrosh(); |
| 544 case SILENCE_SPOKEN_FEEDBACK: | 545 case SILENCE_SPOKEN_FEEDBACK: |
| 545 HandleSilenceSpokenFeedback(); | 546 HandleSilenceSpokenFeedback(); |
| 546 break; | 547 break; |
| 547 case SWAP_PRIMARY_DISPLAY: | 548 case SWAP_PRIMARY_DISPLAY: |
| 548 Shell::GetInstance()->display_controller()->SwapPrimaryDisplay(); | 549 Shell::GetInstance()->display_controller()->SwapPrimaryDisplay(); |
| 549 return true; | 550 return true; |
| 550 case TOGGLE_SPOKEN_FEEDBACK: | 551 case TOGGLE_SPOKEN_FEEDBACK: |
| 551 return HandleToggleSpokenFeedback(); | 552 return HandleToggleSpokenFeedback(); |
| 552 case TOGGLE_WIFI: | 553 case TOGGLE_WIFI: |
| 553 Shell::GetInstance()->system_tray_delegate()->ToggleWifi(); | 554 Shell::GetInstance()->system_tray_notifier()->NotifyRequestToggleWifi(); |
| 554 return true; | 555 return true; |
| 555 case TOUCH_HUD_CLEAR: { | 556 case TOUCH_HUD_CLEAR: { |
| 556 internal::RootWindowController* controller = | 557 internal::RootWindowController* controller = |
| 557 internal::RootWindowController::ForActiveRootWindow(); | 558 internal::RootWindowController::ForActiveRootWindow(); |
| 558 if (controller->touch_observer_hud()) { | 559 if (controller->touch_observer_hud()) { |
| 559 controller->touch_observer_hud()->Clear(); | 560 controller->touch_observer_hud()->Clear(); |
| 560 return true; | 561 return true; |
| 561 } | 562 } |
| 562 return false; | 563 return false; |
| 563 } | 564 } |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 961 keyboard_brightness_control_delegate) { | 962 keyboard_brightness_control_delegate) { |
| 962 keyboard_brightness_control_delegate_ = | 963 keyboard_brightness_control_delegate_ = |
| 963 keyboard_brightness_control_delegate.Pass(); | 964 keyboard_brightness_control_delegate.Pass(); |
| 964 } | 965 } |
| 965 | 966 |
| 966 bool AcceleratorController::CanHandleAccelerators() const { | 967 bool AcceleratorController::CanHandleAccelerators() const { |
| 967 return true; | 968 return true; |
| 968 } | 969 } |
| 969 | 970 |
| 970 } // namespace ash | 971 } // namespace ash |
| OLD | NEW |