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

Side by Side Diff: ash/shell.cc

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

Powered by Google App Engine
This is Rietveld 408576698