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

Side by Side Diff: ash/shell.h

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 class GPUSupport; 83 class GPUSupport;
84 class HighContrastController; 84 class HighContrastController;
85 class LockStateController; 85 class LockStateController;
86 class MagnificationController; 86 class MagnificationController;
87 class MediaDelegate; 87 class MediaDelegate;
88 class MruWindowTracker; 88 class MruWindowTracker;
89 class NestedDispatcherController; 89 class NestedDispatcherController;
90 class NewWindowDelegate; 90 class NewWindowDelegate;
91 class PartialMagnificationController; 91 class PartialMagnificationController;
92 class PowerButtonController; 92 class PowerButtonController;
93 class WindowTreeHostFactory;
94 class ScreenAsh; 93 class ScreenAsh;
95 class SessionStateDelegate; 94 class SessionStateDelegate;
96 class Shelf; 95 class Shelf;
97 class ShelfDelegate; 96 class ShelfDelegate;
98 class ShelfItemDelegateManager; 97 class ShelfItemDelegateManager;
99 class ShelfModel; 98 class ShelfModel;
100 class ShellDelegate; 99 class ShellDelegate;
101 class ShellObserver; 100 class ShellObserver;
102 class StickyKeysController; 101 class StickyKeysController;
103 class SystemTray; 102 class SystemTray;
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 internal::ResolutionNotificationController* 516 internal::ResolutionNotificationController*
518 resolution_notification_controller() { 517 resolution_notification_controller() {
519 return resolution_notification_controller_.get(); 518 return resolution_notification_controller_.get();
520 } 519 }
521 520
522 internal::LogoutConfirmationController* logout_confirmation_controller() { 521 internal::LogoutConfirmationController* logout_confirmation_controller() {
523 return logout_confirmation_controller_.get(); 522 return logout_confirmation_controller_.get();
524 } 523 }
525 #endif // defined(OS_CHROMEOS) 524 #endif // defined(OS_CHROMEOS)
526 525
527 WindowTreeHostFactory* window_tree_host_factory() {
528 return window_tree_host_factory_.get();
529 }
530
531 ShelfModel* shelf_model() { 526 ShelfModel* shelf_model() {
532 return shelf_model_.get(); 527 return shelf_model_.get();
533 } 528 }
534 529
535 WindowPositioner* window_positioner() { 530 WindowPositioner* window_positioner() {
536 return window_positioner_.get(); 531 return window_positioner_.get();
537 } 532 }
538 533
539 // Returns the launcher delegate, creating if necesary. 534 // Returns the launcher delegate, creating if necesary.
540 ShelfDelegate* GetShelfDelegate(); 535 ShelfDelegate* GetShelfDelegate();
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 656 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
662 scoped_ptr<AutoclickController> autoclick_controller_; 657 scoped_ptr<AutoclickController> autoclick_controller_;
663 scoped_ptr<aura::client::FocusClient> focus_client_; 658 scoped_ptr<aura::client::FocusClient> focus_client_;
664 aura::client::ActivationClient* activation_client_; 659 aura::client::ActivationClient* activation_client_;
665 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 660 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
666 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 661 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
667 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 662 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
668 scoped_ptr<internal::EventClientImpl> event_client_; 663 scoped_ptr<internal::EventClientImpl> event_client_;
669 scoped_ptr<internal::EventTransformationHandler> 664 scoped_ptr<internal::EventTransformationHandler>
670 event_transformation_handler_; 665 event_transformation_handler_;
671 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_;
672 666
673 // An event filter that pre-handles key events while the partial 667 // An event filter that pre-handles key events while the partial
674 // screenshot UI or the keyboard overlay is active. 668 // screenshot UI or the keyboard overlay is active.
675 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 669 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
676 670
677 // An event filter for logging keyboard-related metrics. 671 // An event filter for logging keyboard-related metrics.
678 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_; 672 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_;
679 673
680 // An event filter which handles moving and resizing windows. 674 // An event filter which handles moving and resizing windows.
681 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_; 675 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 736
743 // Injected content::GPUDataManager support. 737 // Injected content::GPUDataManager support.
744 scoped_ptr<GPUSupport> gpu_support_; 738 scoped_ptr<GPUSupport> gpu_support_;
745 739
746 DISALLOW_COPY_AND_ASSIGN(Shell); 740 DISALLOW_COPY_AND_ASSIGN(Shell);
747 }; 741 };
748 742
749 } // namespace ash 743 } // namespace ash
750 744
751 #endif // ASH_SHELL_H_ 745 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698