Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Side by Side Diff: ash/shell.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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
OLDNEW
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
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "ash/first_run/first_run_helper_impl.h" 50 #include "ash/first_run/first_run_helper_impl.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/shell_init_params.h" 57 #include "ash/shell_init_params.h"
58 #include "ash/system/chromeos/screen_layout_observer.h" 58 #include "ash/system/chromeos/screen_layout_observer.h"
59 #include "ash/utility/screenshot_controller.h" 59 #include "ash/utility/screenshot_controller.h"
60 #include "ash/wallpaper/wallpaper_controller.h"
61 #include "ash/wallpaper/wallpaper_view.h"
62 #include "ash/wm/ash_focus_rules.h" 60 #include "ash/wm/ash_focus_rules.h"
63 #include "ash/wm/ash_native_cursor_manager.h" 61 #include "ash/wm/ash_native_cursor_manager.h"
64 #include "ash/wm/event_client_impl.h" 62 #include "ash/wm/event_client_impl.h"
65 #include "ash/wm/immersive_handler_factory_ash.h" 63 #include "ash/wm/immersive_handler_factory_ash.h"
66 #include "ash/wm/lock_state_controller.h" 64 #include "ash/wm/lock_state_controller.h"
67 #include "ash/wm/overlay_event_filter.h" 65 #include "ash/wm/overlay_event_filter.h"
68 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" 66 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
69 #include "ash/wm/power_button_controller.h" 67 #include "ash/wm/power_button_controller.h"
70 #include "ash/wm/resize_shadow_controller.h" 68 #include "ash/wm/resize_shadow_controller.h"
71 #include "ash/wm/screen_pinning_controller.h" 69 #include "ash/wm/screen_pinning_controller.h"
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 visibility_controller_.reset(); 617 visibility_controller_.reset();
620 618
621 power_button_controller_.reset(); 619 power_button_controller_.reset();
622 lock_state_controller_.reset(); 620 lock_state_controller_.reset();
623 621
624 screen_pinning_controller_.reset(); 622 screen_pinning_controller_.reset();
625 623
626 #if defined(OS_CHROMEOS) 624 #if defined(OS_CHROMEOS)
627 resolution_notification_controller_.reset(); 625 resolution_notification_controller_.reset();
628 #endif 626 #endif
629 wallpaper_controller_.reset();
630 screenshot_controller_.reset(); 627 screenshot_controller_.reset();
631 mouse_cursor_filter_.reset(); 628 mouse_cursor_filter_.reset();
632 modality_filter_.reset(); 629 modality_filter_.reset();
633 630
634 #if defined(OS_CHROMEOS) 631 #if defined(OS_CHROMEOS)
635 touch_transformer_controller_.reset(); 632 touch_transformer_controller_.reset();
636 stylus_metrics_recorder_.reset(); 633 stylus_metrics_recorder_.reset();
637 audio_a11y_controller_.reset(); 634 audio_a11y_controller_.reset();
638 #endif // defined(OS_CHROMEOS) 635 #endif // defined(OS_CHROMEOS)
639 636
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 877
881 tooltip_controller_.reset(new views::corewm::TooltipController( 878 tooltip_controller_.reset(new views::corewm::TooltipController(
882 std::unique_ptr<views::corewm::Tooltip>(new views::corewm::TooltipAura))); 879 std::unique_ptr<views::corewm::Tooltip>(new views::corewm::TooltipAura)));
883 AddPreTargetHandler(tooltip_controller_.get()); 880 AddPreTargetHandler(tooltip_controller_.get());
884 881
885 modality_filter_.reset(new SystemModalContainerEventFilter(this)); 882 modality_filter_.reset(new SystemModalContainerEventFilter(this));
886 AddPreTargetHandler(modality_filter_.get()); 883 AddPreTargetHandler(modality_filter_.get());
887 884
888 event_client_.reset(new EventClientImpl); 885 event_client_.reset(new EventClientImpl);
889 886
890 // This controller needs to be set before SetupManagedWindowMode.
891 wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
892
893 session_state_delegate_.reset( 887 session_state_delegate_.reset(
894 wm_shell_->delegate()->CreateSessionStateDelegate()); 888 wm_shell_->delegate()->CreateSessionStateDelegate());
895 wm_shell_->CreatePointerWatcherAdapter(); 889 wm_shell_->CreatePointerWatcherAdapter();
896 890
897 resize_shadow_controller_.reset(new ResizeShadowController()); 891 resize_shadow_controller_.reset(new ResizeShadowController());
898 shadow_controller_.reset(new ::wm::ShadowController(activation_client_)); 892 shadow_controller_.reset(new ::wm::ShadowController(activation_client_));
899 893
900 wm_shell_->SetSystemTrayDelegate( 894 wm_shell_->SetSystemTrayDelegate(
901 base::WrapUnique(wm_shell_->delegate()->CreateSystemTrayDelegate())); 895 base::WrapUnique(wm_shell_->delegate()->CreateSystemTrayDelegate()));
902 896
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 1019 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
1026 return std::unique_ptr<ui::EventTargetIterator>(); 1020 return std::unique_ptr<ui::EventTargetIterator>();
1027 } 1021 }
1028 1022
1029 ui::EventTargeter* Shell::GetEventTargeter() { 1023 ui::EventTargeter* Shell::GetEventTargeter() {
1030 NOTREACHED(); 1024 NOTREACHED();
1031 return nullptr; 1025 return nullptr;
1032 } 1026 }
1033 1027
1034 } // namespace ash 1028 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698