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

Side by Side Diff: ash/shell.h

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: cleanup Created 3 years, 8 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
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 class NewWindowController; 123 class NewWindowController;
124 class OverlayEventFilter; 124 class OverlayEventFilter;
125 class PaletteDelegate; 125 class PaletteDelegate;
126 class PartialMagnificationController; 126 class PartialMagnificationController;
127 class PowerButtonController; 127 class PowerButtonController;
128 class PowerEventObserver; 128 class PowerEventObserver;
129 class ProjectingObserver; 129 class ProjectingObserver;
130 class ResizeShadowController; 130 class ResizeShadowController;
131 class ResolutionNotificationController; 131 class ResolutionNotificationController;
132 class RootWindowController; 132 class RootWindowController;
133 class ShellPort;
133 class ScopedOverviewAnimationSettingsFactoryAura; 134 class ScopedOverviewAnimationSettingsFactoryAura;
134 class ScreenLayoutObserver; 135 class ScreenLayoutObserver;
135 class ScreenOrientationController; 136 class ScreenOrientationController;
136 class ScreenshotController; 137 class ScreenshotController;
137 class ScreenPinningController; 138 class ScreenPinningController;
138 class ScreenPositionController; 139 class ScreenPositionController;
139 class SessionController; 140 class SessionController;
140 class SessionStateDelegate; 141 class SessionStateDelegate;
141 class ShelfController; 142 class ShelfController;
142 class ShelfDelegate; 143 class ShelfDelegate;
(...skipping 19 matching lines...) Expand all
162 class VideoActivityNotifier; 163 class VideoActivityNotifier;
163 class VideoDetector; 164 class VideoDetector;
164 class VpnList; 165 class VpnList;
165 class WallpaperController; 166 class WallpaperController;
166 class WallpaperDelegate; 167 class WallpaperDelegate;
167 class WebNotificationTray; 168 class WebNotificationTray;
168 class WindowCycleController; 169 class WindowCycleController;
169 class WindowPositioner; 170 class WindowPositioner;
170 class WindowSelectorController; 171 class WindowSelectorController;
171 class WindowTreeHostManager; 172 class WindowTreeHostManager;
172 class WmShell;
173 class WmWindow; 173 class WmWindow;
174 174
175 enum class Config; 175 enum class Config;
176 enum class LoginStatus; 176 enum class LoginStatus;
177 177
178 namespace shell { 178 namespace shell {
179 class WindowWatcher; 179 class WindowWatcher;
180 } 180 }
181 181
182 namespace test { 182 namespace test {
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 595 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
596 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 596 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
597 friend class AcceleratorControllerTest; 597 friend class AcceleratorControllerTest;
598 friend class RootWindowController; 598 friend class RootWindowController;
599 friend class ScopedRootWindowForNewWindows; 599 friend class ScopedRootWindowForNewWindows;
600 friend class SmsObserverTest; 600 friend class SmsObserverTest;
601 friend class test::ShellTestApi; 601 friend class test::ShellTestApi;
602 friend class shell::WindowWatcher; 602 friend class shell::WindowWatcher;
603 603
604 Shell(std::unique_ptr<ShellDelegate> shell_delegate, 604 Shell(std::unique_ptr<ShellDelegate> shell_delegate,
605 std::unique_ptr<WmShell> wm_shell); 605 std::unique_ptr<ShellPort> shell_port);
606 ~Shell() override; 606 ~Shell() override;
607 607
608 void Init(const ShellInitParams& init_params); 608 void Init(const ShellInitParams& init_params);
609 609
610 // Initializes virtual keyboard controller. 610 // Initializes virtual keyboard controller.
611 void InitKeyboard(); 611 void InitKeyboard();
612 612
613 // Initializes the root window so that it can host browser windows. 613 // Initializes the root window so that it can host browser windows.
614 void InitRootWindow(aura::Window* root_window); 614 void InitRootWindow(aura::Window* root_window);
615 615
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 // Only valid in mash, for classic ash this is null. 647 // Only valid in mash, for classic ash this is null.
648 static aura::WindowTreeClient* window_tree_client_; 648 static aura::WindowTreeClient* window_tree_client_;
649 static aura::WindowManagerClient* window_manager_client_; 649 static aura::WindowManagerClient* window_manager_client_;
650 650
651 // If set before the Shell is initialized, the mouse cursor will be hidden 651 // If set before the Shell is initialized, the mouse cursor will be hidden
652 // when the screen is initially created. 652 // when the screen is initially created.
653 static bool initially_hide_cursor_; 653 static bool initially_hide_cursor_;
654 654
655 std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura> 655 std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
656 scoped_overview_animation_settings_factory_; 656 scoped_overview_animation_settings_factory_;
657 std::unique_ptr<WmShell> wm_shell_; 657 std::unique_ptr<ShellPort> shell_port_;
658 658
659 // The CompoundEventFilter owned by aura::Env object. 659 // The CompoundEventFilter owned by aura::Env object.
660 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 660 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
661 661
662 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 662 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
663 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 663 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
664 std::unique_ptr<WindowPositioner> window_positioner_; 664 std::unique_ptr<WindowPositioner> window_positioner_;
665 665
666 std::unique_ptr<AcceleratorController> accelerator_controller_; 666 std::unique_ptr<AcceleratorController> accelerator_controller_;
667 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 667 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 base::ObserverList<ShellObserver> shell_observers_; 810 base::ObserverList<ShellObserver> shell_observers_;
811 811
812 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 812 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
813 813
814 DISALLOW_COPY_AND_ASSIGN(Shell); 814 DISALLOW_COPY_AND_ASSIGN(Shell);
815 }; 815 };
816 816
817 } // namespace ash 817 } // namespace ash
818 818
819 #endif // ASH_SHELL_H_ 819 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698