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

Side by Side Diff: ash/shell.h

Issue 2870473002: Revert of Introduce ash mojo interface for lock screen action handlers (Closed)
Patch Set: 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/public/interfaces/tray_action.mojom ('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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 class SmsObserver; 150 class SmsObserver;
151 class StickyKeysController; 151 class StickyKeysController;
152 class SystemGestureEventFilter; 152 class SystemGestureEventFilter;
153 class SystemModalContainerEventFilter; 153 class SystemModalContainerEventFilter;
154 class SystemTray; 154 class SystemTray;
155 class SystemTrayController; 155 class SystemTrayController;
156 class SystemTrayDelegate; 156 class SystemTrayDelegate;
157 class SystemTrayNotifier; 157 class SystemTrayNotifier;
158 class ToplevelWindowEventHandler; 158 class ToplevelWindowEventHandler;
159 class ToastManager; 159 class ToastManager;
160 class TrayAction;
161 class TrayBluetoothHelper; 160 class TrayBluetoothHelper;
162 class VirtualKeyboardController; 161 class VirtualKeyboardController;
163 class VideoActivityNotifier; 162 class VideoActivityNotifier;
164 class VideoDetector; 163 class VideoDetector;
165 class VpnList; 164 class VpnList;
166 class WallpaperController; 165 class WallpaperController;
167 class WallpaperDelegate; 166 class WallpaperDelegate;
168 class WebNotificationTray; 167 class WebNotificationTray;
169 class WindowCycleController; 168 class WindowCycleController;
170 class WindowPositioner; 169 class WindowPositioner;
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 336 }
338 SystemTrayDelegate* system_tray_delegate() { 337 SystemTrayDelegate* system_tray_delegate() {
339 return system_tray_delegate_.get(); 338 return system_tray_delegate_.get();
340 } 339 }
341 SystemTrayNotifier* system_tray_notifier() { 340 SystemTrayNotifier* system_tray_notifier() {
342 return system_tray_notifier_.get(); 341 return system_tray_notifier_.get();
343 } 342 }
344 views::corewm::TooltipController* tooltip_controller() { 343 views::corewm::TooltipController* tooltip_controller() {
345 return tooltip_controller_.get(); 344 return tooltip_controller_.get();
346 } 345 }
347 TrayAction* tray_action() { return tray_action_.get(); }
348 VpnList* vpn_list() { return vpn_list_.get(); } 346 VpnList* vpn_list() { return vpn_list_.get(); }
349 WindowCycleController* window_cycle_controller() { 347 WindowCycleController* window_cycle_controller() {
350 return window_cycle_controller_.get(); 348 return window_cycle_controller_.get();
351 } 349 }
352 WindowSelectorController* window_selector_controller() { 350 WindowSelectorController* window_selector_controller() {
353 return window_selector_controller_.get(); 351 return window_selector_controller_.get();
354 } 352 }
355 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 353 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
356 LinkHandlerModelFactory* link_handler_model_factory() { 354 LinkHandlerModelFactory* link_handler_model_factory() {
357 return link_handler_model_factory_; 355 return link_handler_model_factory_;
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 683 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
686 std::unique_ptr<SessionController> session_controller_; 684 std::unique_ptr<SessionController> session_controller_;
687 std::unique_ptr<ShelfController> shelf_controller_; 685 std::unique_ptr<ShelfController> shelf_controller_;
688 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 686 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
689 std::unique_ptr<ShellDelegate> shell_delegate_; 687 std::unique_ptr<ShellDelegate> shell_delegate_;
690 std::unique_ptr<ShutdownController> shutdown_controller_; 688 std::unique_ptr<ShutdownController> shutdown_controller_;
691 std::unique_ptr<SystemTrayController> system_tray_controller_; 689 std::unique_ptr<SystemTrayController> system_tray_controller_;
692 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 690 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
693 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 691 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
694 std::unique_ptr<ToastManager> toast_manager_; 692 std::unique_ptr<ToastManager> toast_manager_;
695 std::unique_ptr<TrayAction> tray_action_;
696 std::unique_ptr<VpnList> vpn_list_; 693 std::unique_ptr<VpnList> vpn_list_;
697 std::unique_ptr<WallpaperController> wallpaper_controller_; 694 std::unique_ptr<WallpaperController> wallpaper_controller_;
698 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; 695 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
699 std::unique_ptr<WindowCycleController> window_cycle_controller_; 696 std::unique_ptr<WindowCycleController> window_cycle_controller_;
700 std::unique_ptr<WindowSelectorController> window_selector_controller_; 697 std::unique_ptr<WindowSelectorController> window_selector_controller_;
701 std::unique_ptr<::wm::ShadowController> shadow_controller_; 698 std::unique_ptr<::wm::ShadowController> shadow_controller_;
702 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 699 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
703 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 700 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
704 std::unique_ptr<app_list::AppList> app_list_; 701 std::unique_ptr<app_list::AppList> app_list_;
705 std::unique_ptr<::PrefService> pref_service_; 702 std::unique_ptr<::PrefService> pref_service_;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 base::ObserverList<ShellObserver> shell_observers_; 809 base::ObserverList<ShellObserver> shell_observers_;
813 810
814 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 811 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
815 812
816 DISALLOW_COPY_AND_ASSIGN(Shell); 813 DISALLOW_COPY_AND_ASSIGN(Shell);
817 }; 814 };
818 815
819 } // namespace ash 816 } // namespace ash
820 817
821 #endif // ASH_SHELL_H_ 818 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/public/interfaces/tray_action.mojom ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698