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

Side by Side Diff: ash/shell.h

Issue 126513004: Rename RootWindowHost to WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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
« no previous file with comments | « ash/host/root_window_host_factory_win.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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 class FirstRunHelper; 85 class FirstRunHelper;
86 class HighContrastController; 86 class HighContrastController;
87 class LockStateController; 87 class LockStateController;
88 class MagnificationController; 88 class MagnificationController;
89 class MediaDelegate; 89 class MediaDelegate;
90 class MruWindowTracker; 90 class MruWindowTracker;
91 class NestedDispatcherController; 91 class NestedDispatcherController;
92 class NewWindowDelegate; 92 class NewWindowDelegate;
93 class PartialMagnificationController; 93 class PartialMagnificationController;
94 class PowerButtonController; 94 class PowerButtonController;
95 class RootWindowHostFactory; 95 class WindowTreeHostFactory;
96 class ScreenAsh; 96 class ScreenAsh;
97 class SessionStateDelegate; 97 class SessionStateDelegate;
98 class Shelf; 98 class Shelf;
99 class ShelfDelegate; 99 class ShelfDelegate;
100 class ShelfItemDelegateManager; 100 class ShelfItemDelegateManager;
101 class ShelfModel; 101 class ShelfModel;
102 class ShellDelegate; 102 class ShellDelegate;
103 class ShellObserver; 103 class ShellObserver;
104 class StickyKeysController; 104 class StickyKeysController;
105 class SystemTray; 105 class SystemTray;
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 internal::DisplayErrorObserver* display_error_observer() { 492 internal::DisplayErrorObserver* display_error_observer() {
493 return display_error_observer_.get(); 493 return display_error_observer_.get();
494 } 494 }
495 #endif // defined(OS_CHROMEOS) && defined(USE_X11) 495 #endif // defined(OS_CHROMEOS) && defined(USE_X11)
496 496
497 internal::ResolutionNotificationController* 497 internal::ResolutionNotificationController*
498 resolution_notification_controller() { 498 resolution_notification_controller() {
499 return resolution_notification_controller_.get(); 499 return resolution_notification_controller_.get();
500 } 500 }
501 501
502 RootWindowHostFactory* root_window_host_factory() { 502 WindowTreeHostFactory* root_window_host_factory() {
503 return root_window_host_factory_.get(); 503 return root_window_host_factory_.get();
504 } 504 }
505 505
506 ShelfModel* shelf_model() { 506 ShelfModel* shelf_model() {
507 return shelf_model_.get(); 507 return shelf_model_.get();
508 } 508 }
509 509
510 WindowPositioner* window_positioner() { 510 WindowPositioner* window_positioner() {
511 return window_positioner_.get(); 511 return window_positioner_.get();
512 } 512 }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 scoped_ptr<AutoclickController> autoclick_controller_; 636 scoped_ptr<AutoclickController> autoclick_controller_;
637 scoped_ptr<aura::client::FocusClient> focus_client_; 637 scoped_ptr<aura::client::FocusClient> focus_client_;
638 scoped_ptr<aura::client::UserActionClient> user_action_client_; 638 scoped_ptr<aura::client::UserActionClient> user_action_client_;
639 aura::client::ActivationClient* activation_client_; 639 aura::client::ActivationClient* activation_client_;
640 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 640 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
641 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 641 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
642 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 642 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
643 scoped_ptr<internal::EventClientImpl> event_client_; 643 scoped_ptr<internal::EventClientImpl> event_client_;
644 scoped_ptr<internal::EventTransformationHandler> 644 scoped_ptr<internal::EventTransformationHandler>
645 event_transformation_handler_; 645 event_transformation_handler_;
646 scoped_ptr<RootWindowHostFactory> root_window_host_factory_; 646 scoped_ptr<WindowTreeHostFactory> root_window_host_factory_;
647 647
648 // An event filter that rewrites or drops an event. 648 // An event filter that rewrites or drops an event.
649 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 649 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
650 650
651 // An event filter that pre-handles key events while the partial 651 // An event filter that pre-handles key events while the partial
652 // screenshot UI or the keyboard overlay is active. 652 // screenshot UI or the keyboard overlay is active.
653 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 653 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
654 654
655 // An event filter for logging keyboard-related metrics. 655 // An event filter for logging keyboard-related metrics.
656 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_; 656 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 bool simulate_modal_window_open_for_testing_; 702 bool simulate_modal_window_open_for_testing_;
703 703
704 bool is_touch_hud_projection_enabled_; 704 bool is_touch_hud_projection_enabled_;
705 705
706 DISALLOW_COPY_AND_ASSIGN(Shell); 706 DISALLOW_COPY_AND_ASSIGN(Shell);
707 }; 707 };
708 708
709 } // namespace ash 709 } // namespace ash
710 710
711 #endif // ASH_SHELL_H_ 711 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/host/root_window_host_factory_win.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698