| 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 <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "ash/touch/touch_hud_debug.h" | 46 #include "ash/touch/touch_hud_debug.h" |
| 47 #include "ash/utility/partial_screenshot_controller.h" | 47 #include "ash/utility/partial_screenshot_controller.h" |
| 48 #include "ash/volume_control_delegate.h" | 48 #include "ash/volume_control_delegate.h" |
| 49 #include "ash/wm/common/wm_event.h" | 49 #include "ash/wm/common/wm_event.h" |
| 50 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 50 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 51 #include "ash/wm/mru_window_tracker.h" | 51 #include "ash/wm/mru_window_tracker.h" |
| 52 #include "ash/wm/overview/window_selector_controller.h" | 52 #include "ash/wm/overview/window_selector_controller.h" |
| 53 #include "ash/wm/power_button_controller.h" | 53 #include "ash/wm/power_button_controller.h" |
| 54 #include "ash/wm/window_cycle_controller.h" | 54 #include "ash/wm/window_cycle_controller.h" |
| 55 #include "ash/wm/window_state.h" | 55 #include "ash/wm/window_state.h" |
| 56 #include "ash/wm/window_state_aura.h" |
| 56 #include "ash/wm/window_util.h" | 57 #include "ash/wm/window_util.h" |
| 57 #include "base/bind.h" | 58 #include "base/bind.h" |
| 58 #include "base/command_line.h" | 59 #include "base/command_line.h" |
| 59 #include "base/metrics/histogram_macros.h" | 60 #include "base/metrics/histogram_macros.h" |
| 60 #include "base/metrics/user_metrics.h" | 61 #include "base/metrics/user_metrics.h" |
| 61 #include "base/strings/string_split.h" | 62 #include "base/strings/string_split.h" |
| 62 #include "base/strings/utf_string_conversions.h" | 63 #include "base/strings/utf_string_conversions.h" |
| 63 #include "ui/aura/env.h" | 64 #include "ui/aura/env.h" |
| 64 #include "ui/base/accelerators/accelerator.h" | 65 #include "ui/base/accelerators/accelerator.h" |
| 65 #include "ui/base/accelerators/accelerator_manager.h" | 66 #include "ui/base/accelerators/accelerator_manager.h" |
| (...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1430 } | 1431 } |
| 1431 | 1432 |
| 1432 void AcceleratorController::SetKeyboardBrightnessControlDelegate( | 1433 void AcceleratorController::SetKeyboardBrightnessControlDelegate( |
| 1433 std::unique_ptr<KeyboardBrightnessControlDelegate> | 1434 std::unique_ptr<KeyboardBrightnessControlDelegate> |
| 1434 keyboard_brightness_control_delegate) { | 1435 keyboard_brightness_control_delegate) { |
| 1435 keyboard_brightness_control_delegate_ = | 1436 keyboard_brightness_control_delegate_ = |
| 1436 std::move(keyboard_brightness_control_delegate); | 1437 std::move(keyboard_brightness_control_delegate); |
| 1437 } | 1438 } |
| 1438 | 1439 |
| 1439 } // namespace ash | 1440 } // namespace ash |
| OLD | NEW |