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

Side by Side Diff: ash/shell.h

Issue 2154523002: Move AccessibilityDelegate ownership to ash::WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setmediadelegate
Patch Set: fix mash_unittests Created 4 years, 5 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/window_manager.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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 class AcceleratorFilter; 73 class AcceleratorFilter;
74 class CompoundEventFilter; 74 class CompoundEventFilter;
75 class ShadowController; 75 class ShadowController;
76 class VisibilityController; 76 class VisibilityController;
77 class WindowModalityController; 77 class WindowModalityController;
78 } 78 }
79 79
80 namespace ash { 80 namespace ash {
81 81
82 class AcceleratorController; 82 class AcceleratorController;
83 class AccessibilityDelegate;
84 class AppListController; 83 class AppListController;
85 class AshNativeCursorManager; 84 class AshNativeCursorManager;
86 class AutoclickController; 85 class AutoclickController;
87 class BluetoothNotificationController; 86 class BluetoothNotificationController;
88 class CaptureController; 87 class CaptureController;
89 class DesktopBackgroundController; 88 class DesktopBackgroundController;
90 class DisplayChangeObserver; 89 class DisplayChangeObserver;
91 class DisplayColorManager; 90 class DisplayColorManager;
92 class DisplayConfigurationController; 91 class DisplayConfigurationController;
93 class WindowTreeHostManager; 92 class WindowTreeHostManager;
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } 366 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
368 367
369 UserWallpaperDelegate* user_wallpaper_delegate() { 368 UserWallpaperDelegate* user_wallpaper_delegate() {
370 return user_wallpaper_delegate_.get(); 369 return user_wallpaper_delegate_.get();
371 } 370 }
372 371
373 SessionStateDelegate* session_state_delegate() { 372 SessionStateDelegate* session_state_delegate() {
374 return session_state_delegate_.get(); 373 return session_state_delegate_.get();
375 } 374 }
376 375
377 AccessibilityDelegate* accessibility_delegate() {
378 return accessibility_delegate_.get();
379 }
380
381 NewWindowDelegate* new_window_delegate() { 376 NewWindowDelegate* new_window_delegate() {
382 return new_window_delegate_.get(); 377 return new_window_delegate_.get();
383 } 378 }
384 379
385 HighContrastController* high_contrast_controller() { 380 HighContrastController* high_contrast_controller() {
386 return high_contrast_controller_.get(); 381 return high_contrast_controller_.get();
387 } 382 }
388 383
389 MagnificationController* magnification_controller() { 384 MagnificationController* magnification_controller() {
390 return magnification_controller_.get(); 385 return magnification_controller_.get();
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 582
588 // The CompoundEventFilter owned by aura::Env object. 583 // The CompoundEventFilter owned by aura::Env object.
589 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 584 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
590 585
591 std::vector<WindowAndBoundsPair> to_restore_; 586 std::vector<WindowAndBoundsPair> to_restore_;
592 587
593 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 588 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
594 std::unique_ptr<AcceleratorController> accelerator_controller_; 589 std::unique_ptr<AcceleratorController> accelerator_controller_;
595 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 590 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
596 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 591 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
597 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
598 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 592 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
599 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; 593 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
600 std::unique_ptr<ShelfDelegate> shelf_delegate_; 594 std::unique_ptr<ShelfDelegate> shelf_delegate_;
601 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 595 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
602 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 596 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
603 597
604 std::unique_ptr<ShelfModel> shelf_model_; 598 std::unique_ptr<ShelfModel> shelf_model_;
605 std::unique_ptr<WindowPositioner> window_positioner_; 599 std::unique_ptr<WindowPositioner> window_positioner_;
606 600
607 std::unique_ptr<DragDropController> drag_drop_controller_; 601 std::unique_ptr<DragDropController> drag_drop_controller_;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 base::SequencedWorkerPool* blocking_pool_; 702 base::SequencedWorkerPool* blocking_pool_;
709 703
710 bool in_mus_ = false; 704 bool in_mus_ = false;
711 705
712 DISALLOW_COPY_AND_ASSIGN(Shell); 706 DISALLOW_COPY_AND_ASSIGN(Shell);
713 }; 707 };
714 708
715 } // namespace ash 709 } // namespace ash
716 710
717 #endif // ASH_SHELL_H_ 711 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698