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

Side by Side Diff: ash/shell.h

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Fix nit. 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 18 matching lines...) Expand all
29 namespace aura { 29 namespace aura {
30 class EventFilter; 30 class EventFilter;
31 class RootWindow; 31 class RootWindow;
32 class Window; 32 class Window;
33 namespace client { 33 namespace client {
34 class ActivationClient; 34 class ActivationClient;
35 class FocusClient; 35 class FocusClient;
36 } 36 }
37 } 37 }
38 38
39 namespace base {
40 class SequencedWorkerPool;
41 }
42
43 namespace chromeos { 39 namespace chromeos {
44 class AudioA11yController; 40 class AudioA11yController;
45 } 41 }
46 42
47 namespace gfx { 43 namespace gfx {
48 class ImageSkia; 44 class ImageSkia;
49 class Point; 45 class Point;
50 class Rect; 46 class Rect;
51 } 47 }
52 48
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 class SystemGestureEventFilter; 117 class SystemGestureEventFilter;
122 class SystemModalContainerEventFilter; 118 class SystemModalContainerEventFilter;
123 class SystemTray; 119 class SystemTray;
124 class ToplevelWindowEventHandler; 120 class ToplevelWindowEventHandler;
125 class TouchTransformerController; 121 class TouchTransformerController;
126 class TouchObserverHUD; 122 class TouchObserverHUD;
127 class ScreenLayoutObserver; 123 class ScreenLayoutObserver;
128 class VirtualKeyboardController; 124 class VirtualKeyboardController;
129 class VideoActivityNotifier; 125 class VideoActivityNotifier;
130 class VideoDetector; 126 class VideoDetector;
131 class WallpaperController;
132 class WebNotificationTray; 127 class WebNotificationTray;
133 class WindowPositioner; 128 class WindowPositioner;
134 class WindowTreeHostManager; 129 class WindowTreeHostManager;
135 class WmShellAura; 130 class WmShellAura;
136 class WmWindow; 131 class WmWindow;
137 132
138 namespace shell { 133 namespace shell {
139 class WindowWatcher; 134 class WindowWatcher;
140 } 135 }
141 136
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 262
268 DisplayManager* display_manager() { return display_manager_.get(); } 263 DisplayManager* display_manager() { return display_manager_.get(); }
269 DisplayConfigurationController* display_configuration_controller() { 264 DisplayConfigurationController* display_configuration_controller() {
270 return display_configuration_controller_.get(); 265 return display_configuration_controller_.get();
271 } 266 }
272 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); } 267 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
273 views::corewm::TooltipController* tooltip_controller() { 268 views::corewm::TooltipController* tooltip_controller() {
274 return tooltip_controller_.get(); 269 return tooltip_controller_.get();
275 } 270 }
276 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 271 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
277 WallpaperController* wallpaper_controller() {
278 return wallpaper_controller_.get();
279 }
280 LinkHandlerModelFactory* link_handler_model_factory() { 272 LinkHandlerModelFactory* link_handler_model_factory() {
281 return link_handler_model_factory_; 273 return link_handler_model_factory_;
282 } 274 }
283 void set_link_handler_model_factory( 275 void set_link_handler_model_factory(
284 LinkHandlerModelFactory* link_handler_model_factory) { 276 LinkHandlerModelFactory* link_handler_model_factory) {
285 link_handler_model_factory_ = link_handler_model_factory; 277 link_handler_model_factory_ = link_handler_model_factory;
286 } 278 }
287 PowerButtonController* power_button_controller() { 279 PowerButtonController* power_button_controller() {
288 return power_button_controller_.get(); 280 return power_button_controller_.get();
289 } 281 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 } 322 }
331 323
332 AutoclickController* autoclick_controller() { 324 AutoclickController* autoclick_controller() {
333 return autoclick_controller_.get(); 325 return autoclick_controller_.get();
334 } 326 }
335 327
336 aura::client::ActivationClient* activation_client() { 328 aura::client::ActivationClient* activation_client() {
337 return activation_client_; 329 return activation_client_;
338 } 330 }
339 331
340 base::SequencedWorkerPool* blocking_pool() { return blocking_pool_; }
341
342 // Force the shelf to query for it's current visibility state. 332 // Force the shelf to query for it's current visibility state.
343 // TODO(jamescook): Move to Shelf. 333 // TODO(jamescook): Move to Shelf.
344 void UpdateShelfVisibility(); 334 void UpdateShelfVisibility();
345 335
346 // Creates a modal background (a partially-opaque fullscreen window) 336 // Creates a modal background (a partially-opaque fullscreen window)
347 // on all displays for |window|. 337 // on all displays for |window|.
348 void CreateModalBackground(aura::Window* window); 338 void CreateModalBackground(aura::Window* window);
349 339
350 // Called when a modal window is removed. It will activate 340 // Called when a modal window is removed. It will activate
351 // another modal window if any, or remove modal screens 341 // another modal window if any, or remove modal screens
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 436 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
447 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 437 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
448 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 438 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
449 friend class RootWindowController; 439 friend class RootWindowController;
450 friend class test::ShellTestApi; 440 friend class test::ShellTestApi;
451 friend class shell::WindowWatcher; 441 friend class shell::WindowWatcher;
452 442
453 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 443 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
454 444
455 // Takes ownership of |delegate|. 445 // Takes ownership of |delegate|.
456 Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool); 446 explicit Shell(ShellDelegate* delegate);
457 ~Shell() override; 447 ~Shell() override;
458 448
459 void Init(const ShellInitParams& init_params); 449 void Init(const ShellInitParams& init_params);
460 450
461 // Initializes virtual keyboard controller. 451 // Initializes virtual keyboard controller.
462 void InitKeyboard(); 452 void InitKeyboard();
463 453
464 // Initializes the root window so that it can host browser windows. 454 // Initializes the root window so that it can host browser windows.
465 void InitRootWindow(aura::Window* root_window); 455 void InitRootWindow(aura::Window* root_window);
466 456
(...skipping 26 matching lines...) Expand all
493 accelerator_controller_delegate_; 483 accelerator_controller_delegate_;
494 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 484 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
495 std::unique_ptr<WindowPositioner> window_positioner_; 485 std::unique_ptr<WindowPositioner> window_positioner_;
496 486
497 std::unique_ptr<DragDropController> drag_drop_controller_; 487 std::unique_ptr<DragDropController> drag_drop_controller_;
498 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 488 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
499 std::unique_ptr<::wm::ShadowController> shadow_controller_; 489 std::unique_ptr<::wm::ShadowController> shadow_controller_;
500 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 490 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
501 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 491 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
502 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 492 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
503 std::unique_ptr<WallpaperController> wallpaper_controller_;
504 LinkHandlerModelFactory* link_handler_model_factory_; 493 LinkHandlerModelFactory* link_handler_model_factory_;
505 std::unique_ptr<PowerButtonController> power_button_controller_; 494 std::unique_ptr<PowerButtonController> power_button_controller_;
506 std::unique_ptr<LockStateController> lock_state_controller_; 495 std::unique_ptr<LockStateController> lock_state_controller_;
507 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 496 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
508 std::unique_ptr<VideoDetector> video_detector_; 497 std::unique_ptr<VideoDetector> video_detector_;
509 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 498 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
510 std::unique_ptr<HighContrastController> high_contrast_controller_; 499 std::unique_ptr<HighContrastController> high_contrast_controller_;
511 std::unique_ptr<MagnificationController> magnification_controller_; 500 std::unique_ptr<MagnificationController> magnification_controller_;
512 std::unique_ptr<PartialMagnificationController> 501 std::unique_ptr<PartialMagnificationController>
513 partial_magnification_controller_; 502 partial_magnification_controller_;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 // For testing only: simulate that a modal window is open 575 // For testing only: simulate that a modal window is open
587 bool simulate_modal_window_open_for_testing_; 576 bool simulate_modal_window_open_for_testing_;
588 577
589 bool is_touch_hud_projection_enabled_; 578 bool is_touch_hud_projection_enabled_;
590 579
591 // Injected content::GPUDataManager support. 580 // Injected content::GPUDataManager support.
592 std::unique_ptr<GPUSupport> gpu_support_; 581 std::unique_ptr<GPUSupport> gpu_support_;
593 582
594 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 583 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
595 584
596 base::SequencedWorkerPool* blocking_pool_;
597
598 bool in_mus_ = false; 585 bool in_mus_ = false;
599 586
600 DISALLOW_COPY_AND_ASSIGN(Shell); 587 DISALLOW_COPY_AND_ASSIGN(Shell);
601 }; 588 };
602 589
603 } // namespace ash 590 } // namespace ash
604 591
605 #endif // ASH_SHELL_H_ 592 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698