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 178183005: Add LogoutConfirmationController to show LogoutConfirmationDialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. 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
« no previous file with comments | « ash/ash.gyp ('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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 class DisplayChangeObserver; 123 class DisplayChangeObserver;
124 class DisplayErrorObserver; 124 class DisplayErrorObserver;
125 class DisplayManager; 125 class DisplayManager;
126 class DragDropController; 126 class DragDropController;
127 class EventClientImpl; 127 class EventClientImpl;
128 class EventRewriterEventFilter; 128 class EventRewriterEventFilter;
129 class EventTransformationHandler; 129 class EventTransformationHandler;
130 class FocusCycler; 130 class FocusCycler;
131 class KeyboardUMAEventFilter; 131 class KeyboardUMAEventFilter;
132 class LocaleNotificationController; 132 class LocaleNotificationController;
133 class LogoutConfirmationController;
133 class MaximizeModeWindowManager; 134 class MaximizeModeWindowManager;
134 class MouseCursorEventFilter; 135 class MouseCursorEventFilter;
135 class OutputConfiguratorAnimation; 136 class OutputConfiguratorAnimation;
136 class OverlayEventFilter; 137 class OverlayEventFilter;
137 class PowerEventObserver; 138 class PowerEventObserver;
138 class ProjectingObserver; 139 class ProjectingObserver;
139 class ResizeShadowController; 140 class ResizeShadowController;
140 class ResolutionNotificationController; 141 class ResolutionNotificationController;
141 class RootWindowController; 142 class RootWindowController;
142 class ScopedTargetRootWindow; 143 class ScopedTargetRootWindow;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 internal::ResolutionNotificationController* 519 internal::ResolutionNotificationController*
519 resolution_notification_controller() { 520 resolution_notification_controller() {
520 return resolution_notification_controller_.get(); 521 return resolution_notification_controller_.get();
521 } 522 }
522 #endif // defined(OS_CHROMEOS) 523 #endif // defined(OS_CHROMEOS)
523 524
524 WindowTreeHostFactory* window_tree_host_factory() { 525 WindowTreeHostFactory* window_tree_host_factory() {
525 return window_tree_host_factory_.get(); 526 return window_tree_host_factory_.get();
526 } 527 }
527 528
529 internal::LogoutConfirmationController* logout_confirmation_controller() {
530 return logout_confirmation_controller_.get();
531 }
532
528 ShelfModel* shelf_model() { 533 ShelfModel* shelf_model() {
529 return shelf_model_.get(); 534 return shelf_model_.get();
530 } 535 }
531 536
532 WindowPositioner* window_positioner() { 537 WindowPositioner* window_positioner() {
533 return window_positioner_.get(); 538 return window_positioner_.get();
534 } 539 }
535 540
536 // Returns the launcher delegate, creating if necesary. 541 // Returns the launcher delegate, creating if necesary.
537 ShelfDelegate* GetShelfDelegate(); 542 ShelfDelegate* GetShelfDelegate();
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 scoped_ptr<aura::client::FocusClient> focus_client_; 668 scoped_ptr<aura::client::FocusClient> focus_client_;
664 scoped_ptr<aura::client::UserActionClient> user_action_client_; 669 scoped_ptr<aura::client::UserActionClient> user_action_client_;
665 aura::client::ActivationClient* activation_client_; 670 aura::client::ActivationClient* activation_client_;
666 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 671 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
667 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 672 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
668 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 673 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
669 scoped_ptr<internal::EventClientImpl> event_client_; 674 scoped_ptr<internal::EventClientImpl> event_client_;
670 scoped_ptr<internal::EventTransformationHandler> 675 scoped_ptr<internal::EventTransformationHandler>
671 event_transformation_handler_; 676 event_transformation_handler_;
672 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_; 677 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_;
678 scoped_ptr<internal::LogoutConfirmationController>
679 logout_confirmation_controller_;
673 680
674 // An event filter that pre-handles key events while the partial 681 // An event filter that pre-handles key events while the partial
675 // screenshot UI or the keyboard overlay is active. 682 // screenshot UI or the keyboard overlay is active.
676 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 683 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
677 684
678 // An event filter for logging keyboard-related metrics. 685 // An event filter for logging keyboard-related metrics.
679 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_; 686 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_;
680 687
681 // An event filter which handles moving and resizing windows. 688 // An event filter which handles moving and resizing windows.
682 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_; 689 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 746
740 // Injected content::GPUDataManager support. 747 // Injected content::GPUDataManager support.
741 scoped_ptr<GPUSupport> gpu_support_; 748 scoped_ptr<GPUSupport> gpu_support_;
742 749
743 DISALLOW_COPY_AND_ASSIGN(Shell); 750 DISALLOW_COPY_AND_ASSIGN(Shell);
744 }; 751 };
745 752
746 } // namespace ash 753 } // namespace ash
747 754
748 #endif // ASH_SHELL_H_ 755 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698