ash/shell.cc - Issue 2222653002: Moves CustomFrameViewAsh to common

Side by Side Diff: ash/shell.cc

Issue 2222653002: Moves CustomFrameViewAsh to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/wm/immersive_fullscreen_controller.h » ('j') | no next file with comments »

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"	17 #include "ash/common/ash_switches.h"

	18 #include "ash/common/frame/custom_frame_view_ash.h"

18 #include "ash/common/gpu_support.h"	19 #include "ash/common/gpu_support.h"

19 #include "ash/common/keyboard/keyboard_ui.h"	20 #include "ash/common/keyboard/keyboard_ui.h"

20 #include "ash/common/login_status.h"	21 #include "ash/common/login_status.h"

21 #include "ash/common/pointer_watcher_delegate.h"	22 #include "ash/common/pointer_watcher_delegate.h"

22 #include "ash/common/session/session_state_delegate.h"	23 #include "ash/common/session/session_state_delegate.h"

23 #include "ash/common/shelf/app_list_shelf_item_delegate.h"	24 #include "ash/common/shelf/app_list_shelf_item_delegate.h"

24 #include "ash/common/shelf/shelf_delegate.h"	25 #include "ash/common/shelf/shelf_delegate.h"

25 #include "ash/common/shelf/shelf_item_delegate.h"	26 #include "ash/common/shelf/shelf_item_delegate.h"

26 #include "ash/common/shelf/shelf_model.h"	27 #include "ash/common/shelf/shelf_model.h"

27 #include "ash/common/shell_delegate.h"	28 #include "ash/common/shell_delegate.h"

(...skipping 12 matching lines...) Expand all Loading...
40 #include "ash/desktop_background/user_wallpaper_delegate.h"	41 #include "ash/desktop_background/user_wallpaper_delegate.h"

41 #include "ash/display/cursor_window_controller.h"	42 #include "ash/display/cursor_window_controller.h"

42 #include "ash/display/display_configuration_controller.h"	43 #include "ash/display/display_configuration_controller.h"

43 #include "ash/display/display_manager.h"	44 #include "ash/display/display_manager.h"

44 #include "ash/display/event_transformation_handler.h"	45 #include "ash/display/event_transformation_handler.h"

45 #include "ash/display/mouse_cursor_event_filter.h"	46 #include "ash/display/mouse_cursor_event_filter.h"

46 #include "ash/display/screen_position_controller.h"	47 #include "ash/display/screen_position_controller.h"

47 #include "ash/display/window_tree_host_manager.h"	48 #include "ash/display/window_tree_host_manager.h"

48 #include "ash/drag_drop/drag_drop_controller.h"	49 #include "ash/drag_drop/drag_drop_controller.h"

49 #include "ash/first_run/first_run_helper_impl.h"	50 #include "ash/first_run/first_run_helper_impl.h"

50 #include "ash/frame/custom_frame_view_ash.h"

51 #include "ash/high_contrast/high_contrast_controller.h"	51 #include "ash/high_contrast/high_contrast_controller.h"

52 #include "ash/host/ash_window_tree_host_init_params.h"	52 #include "ash/host/ash_window_tree_host_init_params.h"

53 #include "ash/ime/input_method_event_handler.h"	53 #include "ash/ime/input_method_event_handler.h"

54 #include "ash/magnifier/magnification_controller.h"	54 #include "ash/magnifier/magnification_controller.h"

55 #include "ash/magnifier/partial_magnification_controller.h"	55 #include "ash/magnifier/partial_magnification_controller.h"

56 #include "ash/root_window_controller.h"	56 #include "ash/root_window_controller.h"

57 #include "ash/shelf/shelf.h"	57 #include "ash/shelf/shelf.h"

58 #include "ash/shelf/shelf_widget.h"	58 #include "ash/shelf/shelf_widget.h"

59 #include "ash/shell_init_params.h"	59 #include "ash/shell_init_params.h"

60 #include "ash/utility/screenshot_controller.h"	60 #include "ash/utility/screenshot_controller.h"

(...skipping 998 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1059 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {	1059 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {

1060 return std::unique_ptr<ui::EventTargetIterator>();	1060 return std::unique_ptr<ui::EventTargetIterator>();

1061 }	1061 }

1062	1062

1063 ui::EventTargeter* Shell::GetEventTargeter() {	1063 ui::EventTargeter* Shell::GetEventTargeter() {

1064 NOTREACHED();	1064 NOTREACHED();

1065 return nullptr;	1065 return nullptr;

1066 }	1066 }

1067	1067

1068 } // namespace ash	1068 } // namespace ash

OLD	NEW