| 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/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 11 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| 12 #include "ash/accelerators/accelerator_delegate.h" | 12 #include "ash/accelerators/accelerator_delegate.h" |
| 13 #include "ash/aura/wm_shell_aura.h" | 13 #include "ash/aura/wm_shell_aura.h" |
| 14 #include "ash/aura/wm_window_aura.h" | 14 #include "ash/aura/wm_window_aura.h" |
| 15 #include "ash/autoclick/autoclick_controller.h" | 15 #include "ash/autoclick/autoclick_controller.h" |
| 16 #include "ash/common/accelerators/accelerator_controller.h" | 16 #include "ash/common/accelerators/accelerator_controller.h" |
| 17 #include "ash/common/ash_switches.h" | |
| 18 #include "ash/common/frame/custom_frame_view_ash.h" | 17 #include "ash/common/frame/custom_frame_view_ash.h" |
| 19 #include "ash/common/gpu_support.h" | 18 #include "ash/common/gpu_support.h" |
| 20 #include "ash/common/keyboard/keyboard_ui.h" | 19 #include "ash/common/keyboard/keyboard_ui.h" |
| 21 #include "ash/common/login_status.h" | 20 #include "ash/common/login_status.h" |
| 22 #include "ash/common/session/session_state_delegate.h" | 21 #include "ash/common/session/session_state_delegate.h" |
| 23 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 22 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
| 24 #include "ash/common/shelf/shelf_delegate.h" | 23 #include "ash/common/shelf/shelf_delegate.h" |
| 25 #include "ash/common/shelf/shelf_item_delegate.h" | 24 #include "ash/common/shelf/shelf_item_delegate.h" |
| 26 #include "ash/common/shelf/shelf_model.h" | 25 #include "ash/common/shelf/shelf_model.h" |
| 27 #include "ash/common/shelf/wm_shelf.h" | 26 #include "ash/common/shelf/wm_shelf.h" |
| (...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 1018 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 1020 return std::unique_ptr<ui::EventTargetIterator>(); | 1019 return std::unique_ptr<ui::EventTargetIterator>(); |
| 1021 } | 1020 } |
| 1022 | 1021 |
| 1023 ui::EventTargeter* Shell::GetEventTargeter() { | 1022 ui::EventTargeter* Shell::GetEventTargeter() { |
| 1024 NOTREACHED(); | 1023 NOTREACHED(); |
| 1025 return nullptr; | 1024 return nullptr; |
| 1026 } | 1025 } |
| 1027 | 1026 |
| 1028 } // namespace ash | 1027 } // namespace ash |
| OLD | NEW |