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

Side by Side Diff: ash/shell.h

Issue 2901903003: [ash] Cleanup of ScopedOverviewAnimationSettings (Closed)
Patch Set: [ash] Cleanup of ScopedOverviewAnimationSettings (nuked factory) Created 3 years, 7 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/BUILD.gn ('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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 class OverlayEventFilter; 130 class OverlayEventFilter;
131 class PaletteDelegate; 131 class PaletteDelegate;
132 class PartialMagnificationController; 132 class PartialMagnificationController;
133 class PowerButtonController; 133 class PowerButtonController;
134 class PowerEventObserver; 134 class PowerEventObserver;
135 class ProjectingObserver; 135 class ProjectingObserver;
136 class ResizeShadowController; 136 class ResizeShadowController;
137 class ResolutionNotificationController; 137 class ResolutionNotificationController;
138 class RootWindowController; 138 class RootWindowController;
139 class ShellPort; 139 class ShellPort;
140 class ScopedOverviewAnimationSettingsFactoryAura;
141 class ScreenLayoutObserver; 140 class ScreenLayoutObserver;
142 class ScreenOrientationController; 141 class ScreenOrientationController;
143 class ScreenshotController; 142 class ScreenshotController;
144 class ScreenPinningController; 143 class ScreenPinningController;
145 class ScreenPositionController; 144 class ScreenPositionController;
146 class SessionController; 145 class SessionController;
147 class SessionStateDelegate; 146 class SessionStateDelegate;
148 class ShelfController; 147 class ShelfController;
149 class ShelfModel; 148 class ShelfModel;
150 class ShelfWindowWatcher; 149 class ShelfWindowWatcher;
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 static Shell* instance_; 669 static Shell* instance_;
671 670
672 // Only valid in mash, for classic ash this is null. 671 // Only valid in mash, for classic ash this is null.
673 static aura::WindowTreeClient* window_tree_client_; 672 static aura::WindowTreeClient* window_tree_client_;
674 static aura::WindowManagerClient* window_manager_client_; 673 static aura::WindowManagerClient* window_manager_client_;
675 674
676 // If set before the Shell is initialized, the mouse cursor will be hidden 675 // If set before the Shell is initialized, the mouse cursor will be hidden
677 // when the screen is initially created. 676 // when the screen is initially created.
678 static bool initially_hide_cursor_; 677 static bool initially_hide_cursor_;
679 678
680 std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
681 scoped_overview_animation_settings_factory_;
682 std::unique_ptr<ShellPort> shell_port_; 679 std::unique_ptr<ShellPort> shell_port_;
683 680
684 // The CompoundEventFilter owned by aura::Env object. 681 // The CompoundEventFilter owned by aura::Env object.
685 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 682 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
686 683
687 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 684 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
688 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 685 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
689 std::unique_ptr<WindowPositioner> window_positioner_; 686 std::unique_ptr<WindowPositioner> window_positioner_;
690 687
691 std::unique_ptr<AcceleratorController> accelerator_controller_; 688 std::unique_ptr<AcceleratorController> accelerator_controller_;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 base::ObserverList<ShellObserver> shell_observers_; 834 base::ObserverList<ShellObserver> shell_observers_;
838 835
839 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 836 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
840 837
841 DISALLOW_COPY_AND_ASSIGN(Shell); 838 DISALLOW_COPY_AND_ASSIGN(Shell);
842 }; 839 };
843 840
844 } // namespace ash 841 } // namespace ash
845 842
846 #endif // ASH_SHELL_H_ 843 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698