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

Side by Side Diff: ash/shell.h

Issue 2764643003: cros: Move TrayBluetoothHelper out of chrome into ash (Closed)
Patch Set: rebase fix 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/system/tray/system_tray_controller.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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 class OverlayEventFilter; 121 class OverlayEventFilter;
122 class PaletteDelegate; 122 class PaletteDelegate;
123 class PartialMagnificationController; 123 class PartialMagnificationController;
124 class PowerButtonController; 124 class PowerButtonController;
125 class PowerEventObserver; 125 class PowerEventObserver;
126 class ProjectingObserver; 126 class ProjectingObserver;
127 class ResizeShadowController; 127 class ResizeShadowController;
128 class ResolutionNotificationController; 128 class ResolutionNotificationController;
129 class RootWindowController; 129 class RootWindowController;
130 class ScopedOverviewAnimationSettingsFactoryAura; 130 class ScopedOverviewAnimationSettingsFactoryAura;
131 class ScreenLayoutObserver;
131 class ScreenOrientationController; 132 class ScreenOrientationController;
132 class ScreenshotController; 133 class ScreenshotController;
133 class ScreenPinningController; 134 class ScreenPinningController;
134 class ScreenPositionController; 135 class ScreenPositionController;
135 class SessionStateDelegate; 136 class SessionStateDelegate;
136 class ShellDelegate; 137 class ShellDelegate;
137 struct ShellInitParams; 138 struct ShellInitParams;
138 class ShellObserver; 139 class ShellObserver;
139 class ShutdownObserver; 140 class ShutdownObserver;
140 class SmsObserver; 141 class SmsObserver;
141 class StickyKeysController; 142 class StickyKeysController;
142 class SystemGestureEventFilter; 143 class SystemGestureEventFilter;
143 class SystemModalContainerEventFilter; 144 class SystemModalContainerEventFilter;
144 class SystemTray; 145 class SystemTray;
145 class SystemTrayController; 146 class SystemTrayController;
146 class SystemTrayDelegate; 147 class SystemTrayDelegate;
147 class ToplevelWindowEventHandler; 148 class ToplevelWindowEventHandler;
148 class ScreenLayoutObserver;
149 class ToastManager; 149 class ToastManager;
150 class TrayBluetoothHelper;
150 class VirtualKeyboardController; 151 class VirtualKeyboardController;
151 class VideoActivityNotifier; 152 class VideoActivityNotifier;
152 class VideoDetector; 153 class VideoDetector;
153 class WallpaperController; 154 class WallpaperController;
154 class WallpaperDelegate; 155 class WallpaperDelegate;
155 class WebNotificationTray; 156 class WebNotificationTray;
156 class WindowPositioner; 157 class WindowPositioner;
157 class WindowTreeHostManager; 158 class WindowTreeHostManager;
158 class WmShell; 159 class WmShell;
159 class WmWindow; 160 class WmWindow;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 } 432 }
432 433
433 ResolutionNotificationController* resolution_notification_controller() { 434 ResolutionNotificationController* resolution_notification_controller() {
434 return resolution_notification_controller_.get(); 435 return resolution_notification_controller_.get();
435 } 436 }
436 437
437 ScreenOrientationController* screen_orientation_controller() { 438 ScreenOrientationController* screen_orientation_controller() {
438 return screen_orientation_controller_.get(); 439 return screen_orientation_controller_.get();
439 } 440 }
440 441
442 TrayBluetoothHelper* tray_bluetooth_helper() {
443 return tray_bluetooth_helper_.get();
444 }
445
441 VirtualKeyboardController* virtual_keyboard_controller() { 446 VirtualKeyboardController* virtual_keyboard_controller() {
442 return virtual_keyboard_controller_.get(); 447 return virtual_keyboard_controller_.get();
443 } 448 }
444 449
445 chromeos::AudioA11yController* audio_a11y_controller() { 450 chromeos::AudioA11yController* audio_a11y_controller() {
446 return audio_a11y_controller_.get(); 451 return audio_a11y_controller_.get();
447 } 452 }
448 453
449 WindowPositioner* window_positioner() { return window_positioner_.get(); } 454 WindowPositioner* window_positioner() { return window_positioner_.get(); }
450 455
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 std::unique_ptr<aura::UserActivityForwarder> user_activity_forwarder_; 678 std::unique_ptr<aura::UserActivityForwarder> user_activity_forwarder_;
674 679
675 std::unique_ptr<PowerEventObserver> power_event_observer_; 680 std::unique_ptr<PowerEventObserver> power_event_observer_;
676 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 681 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
677 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_; 682 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_;
678 std::unique_ptr<StickyKeysController> sticky_keys_controller_; 683 std::unique_ptr<StickyKeysController> sticky_keys_controller_;
679 std::unique_ptr<ResolutionNotificationController> 684 std::unique_ptr<ResolutionNotificationController>
680 resolution_notification_controller_; 685 resolution_notification_controller_;
681 std::unique_ptr<BluetoothNotificationController> 686 std::unique_ptr<BluetoothNotificationController>
682 bluetooth_notification_controller_; 687 bluetooth_notification_controller_;
688 std::unique_ptr<TrayBluetoothHelper> tray_bluetooth_helper_;
683 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 689 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
684 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; 690 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
685 // Controls video output device state. 691 // Controls video output device state.
686 std::unique_ptr<display::DisplayConfigurator> display_configurator_; 692 std::unique_ptr<display::DisplayConfigurator> display_configurator_;
687 std::unique_ptr<DisplayColorManager> display_color_manager_; 693 std::unique_ptr<DisplayColorManager> display_color_manager_;
688 std::unique_ptr<DisplayErrorObserver> display_error_observer_; 694 std::unique_ptr<DisplayErrorObserver> display_error_observer_;
689 std::unique_ptr<ProjectingObserver> projecting_observer_; 695 std::unique_ptr<ProjectingObserver> projecting_observer_;
690 696
691 // Listens for output changes and updates the display manager. 697 // Listens for output changes and updates the display manager.
692 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_; 698 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 base::ObserverList<ShellObserver> shell_observers_; 742 base::ObserverList<ShellObserver> shell_observers_;
737 743
738 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 744 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
739 745
740 DISALLOW_COPY_AND_ASSIGN(Shell); 746 DISALLOW_COPY_AND_ASSIGN(Shell);
741 }; 747 };
742 748
743 } // namespace ash 749 } // namespace ash
744 750
745 #endif // ASH_SHELL_H_ 751 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698