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

Side by Side Diff: ash/shell.h

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)
Patch Set: feedback Created 3 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
« no previous file with comments | « ash/common/wm_shell.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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 class ScreenPositionController; 141 class ScreenPositionController;
142 class SessionController; 142 class SessionController;
143 class SessionStateDelegate; 143 class SessionStateDelegate;
144 class ShelfController; 144 class ShelfController;
145 class ShelfDelegate; 145 class ShelfDelegate;
146 class ShelfModel; 146 class ShelfModel;
147 class ShelfWindowWatcher; 147 class ShelfWindowWatcher;
148 class ShellDelegate; 148 class ShellDelegate;
149 struct ShellInitParams; 149 struct ShellInitParams;
150 class ShellObserver; 150 class ShellObserver;
151 class ShutdownController;
151 class ShutdownObserver; 152 class ShutdownObserver;
152 class SmsObserver; 153 class SmsObserver;
153 class StickyKeysController; 154 class StickyKeysController;
154 class SystemGestureEventFilter; 155 class SystemGestureEventFilter;
155 class SystemModalContainerEventFilter; 156 class SystemModalContainerEventFilter;
156 class SystemTray; 157 class SystemTray;
157 class SystemTrayController; 158 class SystemTrayController;
158 class SystemTrayDelegate; 159 class SystemTrayDelegate;
160 class SystemTrayNotifier;
159 class ToplevelWindowEventHandler; 161 class ToplevelWindowEventHandler;
160 class ToastManager; 162 class ToastManager;
161 class TrayBluetoothHelper; 163 class TrayBluetoothHelper;
162 class VirtualKeyboardController; 164 class VirtualKeyboardController;
163 class VideoActivityNotifier; 165 class VideoActivityNotifier;
164 class VideoDetector; 166 class VideoDetector;
167 class VpnList;
165 class WallpaperController; 168 class WallpaperController;
166 class WallpaperDelegate; 169 class WallpaperDelegate;
167 class WebNotificationTray; 170 class WebNotificationTray;
171 class WindowCycleController;
168 class WindowPositioner; 172 class WindowPositioner;
173 class WindowSelectorController;
169 class WindowTreeHostManager; 174 class WindowTreeHostManager;
170 class WmShell; 175 class WmShell;
171 class WmWindow; 176 class WmWindow;
172 177
173 namespace shell { 178 namespace shell {
174 class WindowWatcher; 179 class WindowWatcher;
175 } 180 }
176 181
177 namespace test { 182 namespace test {
178 class ShellTestApi; 183 class ShellTestApi;
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 } 335 }
331 MediaController* media_controller() { return media_controller_.get(); } 336 MediaController* media_controller() { return media_controller_.get(); }
332 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } 337 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
333 NewWindowController* new_window_controller() { 338 NewWindowController* new_window_controller() {
334 return new_window_controller_.get(); 339 return new_window_controller_.get();
335 } 340 }
336 SessionController* session_controller() { return session_controller_.get(); } 341 SessionController* session_controller() { return session_controller_.get(); }
337 ShelfController* shelf_controller() { return shelf_controller_.get(); } 342 ShelfController* shelf_controller() { return shelf_controller_.get(); }
338 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } 343 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
339 ShelfModel* shelf_model(); 344 ShelfModel* shelf_model();
345 ShutdownController* shutdown_controller() {
346 return shutdown_controller_.get();
347 }
340 SystemTrayController* system_tray_controller() { 348 SystemTrayController* system_tray_controller() {
341 return system_tray_controller_.get(); 349 return system_tray_controller_.get();
342 } 350 }
343 SystemTrayDelegate* system_tray_delegate() { 351 SystemTrayDelegate* system_tray_delegate() {
344 return system_tray_delegate_.get(); 352 return system_tray_delegate_.get();
345 } 353 }
354 SystemTrayNotifier* system_tray_notifier() {
355 return system_tray_notifier_.get();
356 }
346 views::corewm::TooltipController* tooltip_controller() { 357 views::corewm::TooltipController* tooltip_controller() {
347 return tooltip_controller_.get(); 358 return tooltip_controller_.get();
348 } 359 }
360 VpnList* vpn_list() { return vpn_list_.get(); }
361 WindowCycleController* window_cycle_controller() {
362 return window_cycle_controller_.get();
363 }
364 WindowSelectorController* window_selector_controller() {
365 return window_selector_controller_.get();
366 }
349 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 367 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
350 LinkHandlerModelFactory* link_handler_model_factory() { 368 LinkHandlerModelFactory* link_handler_model_factory() {
351 return link_handler_model_factory_; 369 return link_handler_model_factory_;
352 } 370 }
353 void set_link_handler_model_factory( 371 void set_link_handler_model_factory(
354 LinkHandlerModelFactory* link_handler_model_factory) { 372 LinkHandlerModelFactory* link_handler_model_factory) {
355 link_handler_model_factory_ = link_handler_model_factory; 373 link_handler_model_factory_ = link_handler_model_factory;
356 } 374 }
357 PowerButtonController* power_button_controller() { 375 PowerButtonController* power_button_controller() {
358 return power_button_controller_.get(); 376 return power_button_controller_.get();
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 std::unique_ptr<MediaController> media_controller_; 680 std::unique_ptr<MediaController> media_controller_;
663 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 681 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
664 std::unique_ptr<NewWindowController> new_window_controller_; 682 std::unique_ptr<NewWindowController> new_window_controller_;
665 std::unique_ptr<PaletteDelegate> palette_delegate_; 683 std::unique_ptr<PaletteDelegate> palette_delegate_;
666 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 684 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
667 std::unique_ptr<SessionController> session_controller_; 685 std::unique_ptr<SessionController> session_controller_;
668 std::unique_ptr<ShelfController> shelf_controller_; 686 std::unique_ptr<ShelfController> shelf_controller_;
669 std::unique_ptr<ShelfDelegate> shelf_delegate_; 687 std::unique_ptr<ShelfDelegate> shelf_delegate_;
670 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 688 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
671 std::unique_ptr<ShellDelegate> shell_delegate_; 689 std::unique_ptr<ShellDelegate> shell_delegate_;
690 std::unique_ptr<ShutdownController> shutdown_controller_;
672 std::unique_ptr<SystemTrayController> system_tray_controller_; 691 std::unique_ptr<SystemTrayController> system_tray_controller_;
673 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 692 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
693 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
674 std::unique_ptr<ToastManager> toast_manager_; 694 std::unique_ptr<ToastManager> toast_manager_;
695 std::unique_ptr<VpnList> vpn_list_;
675 std::unique_ptr<WallpaperController> wallpaper_controller_; 696 std::unique_ptr<WallpaperController> wallpaper_controller_;
676 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; 697 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
698 std::unique_ptr<WindowCycleController> window_cycle_controller_;
699 std::unique_ptr<WindowSelectorController> window_selector_controller_;
677 std::unique_ptr<::wm::ShadowController> shadow_controller_; 700 std::unique_ptr<::wm::ShadowController> shadow_controller_;
678 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 701 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
679 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 702 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
680 std::unique_ptr<app_list::AppList> app_list_; 703 std::unique_ptr<app_list::AppList> app_list_;
681 scoped_refptr<preferences::PrefClientStore> pref_store_; 704 scoped_refptr<preferences::PrefClientStore> pref_store_;
682 std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_; 705 std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
683 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 706 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
684 LinkHandlerModelFactory* link_handler_model_factory_; 707 LinkHandlerModelFactory* link_handler_model_factory_;
685 std::unique_ptr<PowerButtonController> power_button_controller_; 708 std::unique_ptr<PowerButtonController> power_button_controller_;
686 std::unique_ptr<LockStateController> lock_state_controller_; 709 std::unique_ptr<LockStateController> lock_state_controller_;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 base::ObserverList<ShellObserver> shell_observers_; 811 base::ObserverList<ShellObserver> shell_observers_;
789 812
790 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 813 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
791 814
792 DISALLOW_COPY_AND_ASSIGN(Shell); 815 DISALLOW_COPY_AND_ASSIGN(Shell);
793 }; 816 };
794 817
795 } // namespace ash 818 } // namespace ash
796 819
797 #endif // ASH_SHELL_H_ 820 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698