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

Side by Side Diff: ash/shell.h

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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 class SystemGestureEventFilter; 121 class SystemGestureEventFilter;
122 class SystemModalContainerEventFilter; 122 class SystemModalContainerEventFilter;
123 class SystemTray; 123 class SystemTray;
124 class ToplevelWindowEventHandler; 124 class ToplevelWindowEventHandler;
125 class TouchTransformerController; 125 class TouchTransformerController;
126 class TouchObserverHUD; 126 class TouchObserverHUD;
127 class ScreenLayoutObserver; 127 class ScreenLayoutObserver;
128 class VirtualKeyboardController; 128 class VirtualKeyboardController;
129 class VideoActivityNotifier; 129 class VideoActivityNotifier;
130 class VideoDetector; 130 class VideoDetector;
131 class WallpaperController;
132 class WebNotificationTray; 131 class WebNotificationTray;
133 class WindowPositioner; 132 class WindowPositioner;
134 class WindowTreeHostManager; 133 class WindowTreeHostManager;
135 class WmShellAura; 134 class WmShellAura;
136 class WmWindow; 135 class WmWindow;
137 136
138 namespace shell { 137 namespace shell {
139 class WindowWatcher; 138 class WindowWatcher;
140 } 139 }
141 140
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 266
268 DisplayManager* display_manager() { return display_manager_.get(); } 267 DisplayManager* display_manager() { return display_manager_.get(); }
269 DisplayConfigurationController* display_configuration_controller() { 268 DisplayConfigurationController* display_configuration_controller() {
270 return display_configuration_controller_.get(); 269 return display_configuration_controller_.get();
271 } 270 }
272 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); } 271 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
273 views::corewm::TooltipController* tooltip_controller() { 272 views::corewm::TooltipController* tooltip_controller() {
274 return tooltip_controller_.get(); 273 return tooltip_controller_.get();
275 } 274 }
276 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 275 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
277 WallpaperController* wallpaper_controller() {
278 return wallpaper_controller_.get();
279 }
280 LinkHandlerModelFactory* link_handler_model_factory() { 276 LinkHandlerModelFactory* link_handler_model_factory() {
281 return link_handler_model_factory_; 277 return link_handler_model_factory_;
282 } 278 }
283 void set_link_handler_model_factory( 279 void set_link_handler_model_factory(
284 LinkHandlerModelFactory* link_handler_model_factory) { 280 LinkHandlerModelFactory* link_handler_model_factory) {
285 link_handler_model_factory_ = link_handler_model_factory; 281 link_handler_model_factory_ = link_handler_model_factory;
286 } 282 }
287 PowerButtonController* power_button_controller() { 283 PowerButtonController* power_button_controller() {
288 return power_button_controller_.get(); 284 return power_button_controller_.get();
289 } 285 }
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 accelerator_controller_delegate_; 489 accelerator_controller_delegate_;
494 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 490 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
495 std::unique_ptr<WindowPositioner> window_positioner_; 491 std::unique_ptr<WindowPositioner> window_positioner_;
496 492
497 std::unique_ptr<DragDropController> drag_drop_controller_; 493 std::unique_ptr<DragDropController> drag_drop_controller_;
498 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 494 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
499 std::unique_ptr<::wm::ShadowController> shadow_controller_; 495 std::unique_ptr<::wm::ShadowController> shadow_controller_;
500 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 496 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
501 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 497 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
502 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 498 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
503 std::unique_ptr<WallpaperController> wallpaper_controller_;
504 LinkHandlerModelFactory* link_handler_model_factory_; 499 LinkHandlerModelFactory* link_handler_model_factory_;
505 std::unique_ptr<PowerButtonController> power_button_controller_; 500 std::unique_ptr<PowerButtonController> power_button_controller_;
506 std::unique_ptr<LockStateController> lock_state_controller_; 501 std::unique_ptr<LockStateController> lock_state_controller_;
507 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 502 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
508 std::unique_ptr<VideoDetector> video_detector_; 503 std::unique_ptr<VideoDetector> video_detector_;
509 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 504 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
510 std::unique_ptr<HighContrastController> high_contrast_controller_; 505 std::unique_ptr<HighContrastController> high_contrast_controller_;
511 std::unique_ptr<MagnificationController> magnification_controller_; 506 std::unique_ptr<MagnificationController> magnification_controller_;
512 std::unique_ptr<PartialMagnificationController> 507 std::unique_ptr<PartialMagnificationController>
513 partial_magnification_controller_; 508 partial_magnification_controller_;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 base::SequencedWorkerPool* blocking_pool_; 591 base::SequencedWorkerPool* blocking_pool_;
597 592
598 bool in_mus_ = false; 593 bool in_mus_ = false;
599 594
600 DISALLOW_COPY_AND_ASSIGN(Shell); 595 DISALLOW_COPY_AND_ASSIGN(Shell);
601 }; 596 };
602 597
603 } // namespace ash 598 } // namespace ash
604 599
605 #endif // ASH_SHELL_H_ 600 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698