| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include "ash/wm/overview/window_selector_controller.h" | 51 #include "ash/wm/overview/window_selector_controller.h" |
| 52 #include "ash/wm/power_button_controller.h" | 52 #include "ash/wm/power_button_controller.h" |
| 53 #include "ash/wm/window_cycle_controller.h" | 53 #include "ash/wm/window_cycle_controller.h" |
| 54 #include "ash/wm/window_state.h" | 54 #include "ash/wm/window_state.h" |
| 55 #include "ash/wm/window_util.h" | 55 #include "ash/wm/window_util.h" |
| 56 #include "ash/wm/wm_event.h" | 56 #include "ash/wm/wm_event.h" |
| 57 #include "base/bind.h" | 57 #include "base/bind.h" |
| 58 #include "base/command_line.h" | 58 #include "base/command_line.h" |
| 59 #include "base/metrics/histogram_macros.h" | 59 #include "base/metrics/histogram_macros.h" |
| 60 #include "base/metrics/user_metrics.h" | 60 #include "base/metrics/user_metrics.h" |
| 61 #include "base/strings/string_split.h" |
| 61 #include "base/strings/utf_string_conversions.h" | 62 #include "base/strings/utf_string_conversions.h" |
| 62 #include "ui/aura/env.h" | 63 #include "ui/aura/env.h" |
| 63 #include "ui/base/accelerators/accelerator.h" | 64 #include "ui/base/accelerators/accelerator.h" |
| 64 #include "ui/base/accelerators/accelerator_manager.h" | 65 #include "ui/base/accelerators/accelerator_manager.h" |
| 65 #include "ui/base/l10n/l10n_util.h" | 66 #include "ui/base/l10n/l10n_util.h" |
| 66 #include "ui/base/resource/resource_bundle.h" | 67 #include "ui/base/resource/resource_bundle.h" |
| 67 #include "ui/compositor/layer.h" | 68 #include "ui/compositor/layer.h" |
| 68 #include "ui/compositor/layer_animation_sequence.h" | 69 #include "ui/compositor/layer_animation_sequence.h" |
| 69 #include "ui/compositor/layer_animator.h" | 70 #include "ui/compositor/layer_animator.h" |
| 70 #include "ui/events/event.h" | 71 #include "ui/events/event.h" |
| 71 #include "ui/events/keycodes/keyboard_codes.h" | 72 #include "ui/events/keycodes/keyboard_codes.h" |
| 72 #include "ui/gfx/screen.h" | 73 #include "ui/gfx/screen.h" |
| 73 #include "ui/message_center/message_center.h" | 74 #include "ui/message_center/message_center.h" |
| 74 #include "ui/message_center/notification.h" | 75 #include "ui/message_center/notification.h" |
| 75 #include "ui/message_center/notifier_settings.h" | 76 #include "ui/message_center/notifier_settings.h" |
| 76 #include "ui/views/controls/webview/webview.h" | |
| 77 | 77 |
| 78 #if defined(OS_CHROMEOS) | 78 #if defined(OS_CHROMEOS) |
| 79 #include "ash/display/display_configuration_controller.h" | 79 #include "ash/display/display_configuration_controller.h" |
| 80 #include "ash/system/chromeos/keyboard_brightness_controller.h" | 80 #include "ash/system/chromeos/keyboard_brightness_controller.h" |
| 81 #include "base/sys_info.h" | 81 #include "base/sys_info.h" |
| 82 #include "ui/base/ime/chromeos/ime_keyboard.h" | 82 #include "ui/base/ime/chromeos/ime_keyboard.h" |
| 83 #include "ui/base/ime/chromeos/input_method_manager.h" | 83 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 84 #endif // defined(OS_CHROMEOS) | 84 #endif // defined(OS_CHROMEOS) |
| 85 | 85 |
| 86 namespace ash { | 86 namespace ash { |
| (...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1451 } | 1451 } |
| 1452 | 1452 |
| 1453 void AcceleratorController::SetKeyboardBrightnessControlDelegate( | 1453 void AcceleratorController::SetKeyboardBrightnessControlDelegate( |
| 1454 scoped_ptr<KeyboardBrightnessControlDelegate> | 1454 scoped_ptr<KeyboardBrightnessControlDelegate> |
| 1455 keyboard_brightness_control_delegate) { | 1455 keyboard_brightness_control_delegate) { |
| 1456 keyboard_brightness_control_delegate_ = | 1456 keyboard_brightness_control_delegate_ = |
| 1457 std::move(keyboard_brightness_control_delegate); | 1457 std::move(keyboard_brightness_control_delegate); |
| 1458 } | 1458 } |
| 1459 | 1459 |
| 1460 } // namespace ash | 1460 } // namespace ash |
| OLD | NEW |