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

Side by Side Diff: ash/shell.h

Issue 2764643003: cros: Move TrayBluetoothHelper out of chrome into ash (Closed)
Patch Set: 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
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 class OverlayEventFilter; 114 class OverlayEventFilter;
115 class PaletteDelegate; 115 class PaletteDelegate;
116 class PartialMagnificationController; 116 class PartialMagnificationController;
117 class PowerButtonController; 117 class PowerButtonController;
118 class PowerEventObserver; 118 class PowerEventObserver;
119 class ProjectingObserver; 119 class ProjectingObserver;
120 class ResizeShadowController; 120 class ResizeShadowController;
121 class ResolutionNotificationController; 121 class ResolutionNotificationController;
122 class RootWindowController; 122 class RootWindowController;
123 class ScopedOverviewAnimationSettingsFactoryAura; 123 class ScopedOverviewAnimationSettingsFactoryAura;
124 class ScreenLayoutObserver;
124 class ScreenOrientationController; 125 class ScreenOrientationController;
125 class ScreenshotController; 126 class ScreenshotController;
126 class ScreenPinningController; 127 class ScreenPinningController;
127 class ScreenPositionController; 128 class ScreenPositionController;
128 class SessionStateDelegate; 129 class SessionStateDelegate;
129 class ShellDelegate; 130 class ShellDelegate;
130 struct ShellInitParams; 131 struct ShellInitParams;
131 class ShellObserver; 132 class ShellObserver;
132 class ShutdownObserver; 133 class ShutdownObserver;
133 class SmsObserver; 134 class SmsObserver;
134 class StickyKeysController; 135 class StickyKeysController;
135 class SystemGestureEventFilter; 136 class SystemGestureEventFilter;
136 class SystemModalContainerEventFilter; 137 class SystemModalContainerEventFilter;
137 class SystemTray; 138 class SystemTray;
138 class ToplevelWindowEventHandler; 139 class ToplevelWindowEventHandler;
139 class ScreenLayoutObserver;
140 class ToastManager; 140 class ToastManager;
141 class TrayBluetoothHelper;
141 class VirtualKeyboardController; 142 class VirtualKeyboardController;
142 class VideoActivityNotifier; 143 class VideoActivityNotifier;
143 class VideoDetector; 144 class VideoDetector;
144 class WallpaperController; 145 class WallpaperController;
145 class WallpaperDelegate; 146 class WallpaperDelegate;
146 class WebNotificationTray; 147 class WebNotificationTray;
147 class WindowPositioner; 148 class WindowPositioner;
148 class WindowTreeHostManager; 149 class WindowTreeHostManager;
149 class WmShell; 150 class WmShell;
150 class WmWindow; 151 class WmWindow;
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 } 402 }
402 403
403 ResolutionNotificationController* resolution_notification_controller() { 404 ResolutionNotificationController* resolution_notification_controller() {
404 return resolution_notification_controller_.get(); 405 return resolution_notification_controller_.get();
405 } 406 }
406 407
407 ScreenOrientationController* screen_orientation_controller() { 408 ScreenOrientationController* screen_orientation_controller() {
408 return screen_orientation_controller_.get(); 409 return screen_orientation_controller_.get();
409 } 410 }
410 411
412 TrayBluetoothHelper* tray_bluetooth_helper() {
413 return tray_bluetooth_helper_.get();
414 }
415
411 VirtualKeyboardController* virtual_keyboard_controller() { 416 VirtualKeyboardController* virtual_keyboard_controller() {
412 return virtual_keyboard_controller_.get(); 417 return virtual_keyboard_controller_.get();
413 } 418 }
414 419
415 chromeos::AudioA11yController* audio_a11y_controller() { 420 chromeos::AudioA11yController* audio_a11y_controller() {
416 return audio_a11y_controller_.get(); 421 return audio_a11y_controller_.get();
417 } 422 }
418 423
419 WindowPositioner* window_positioner() { return window_positioner_.get(); } 424 WindowPositioner* window_positioner() { return window_positioner_.get(); }
420 425
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 std::unique_ptr<aura::UserActivityForwarder> user_activity_forwarder_; 634 std::unique_ptr<aura::UserActivityForwarder> user_activity_forwarder_;
630 635
631 std::unique_ptr<PowerEventObserver> power_event_observer_; 636 std::unique_ptr<PowerEventObserver> power_event_observer_;
632 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 637 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
633 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_; 638 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_;
634 std::unique_ptr<StickyKeysController> sticky_keys_controller_; 639 std::unique_ptr<StickyKeysController> sticky_keys_controller_;
635 std::unique_ptr<ResolutionNotificationController> 640 std::unique_ptr<ResolutionNotificationController>
636 resolution_notification_controller_; 641 resolution_notification_controller_;
637 std::unique_ptr<BluetoothNotificationController> 642 std::unique_ptr<BluetoothNotificationController>
638 bluetooth_notification_controller_; 643 bluetooth_notification_controller_;
644 // The helper persists whereas system tray items are created on menu open.
msw 2017/03/20 23:47:07 Hmm, I'm not sure this is the best place for this
James Cook 2017/03/21 00:18:08 Agreed. Removed comment.
645 std::unique_ptr<TrayBluetoothHelper> tray_bluetooth_helper_;
639 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 646 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
640 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; 647 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
641 // Controls video output device state. 648 // Controls video output device state.
642 std::unique_ptr<display::DisplayConfigurator> display_configurator_; 649 std::unique_ptr<display::DisplayConfigurator> display_configurator_;
643 std::unique_ptr<DisplayColorManager> display_color_manager_; 650 std::unique_ptr<DisplayColorManager> display_color_manager_;
644 std::unique_ptr<DisplayErrorObserver> display_error_observer_; 651 std::unique_ptr<DisplayErrorObserver> display_error_observer_;
645 std::unique_ptr<ProjectingObserver> projecting_observer_; 652 std::unique_ptr<ProjectingObserver> projecting_observer_;
646 653
647 // Listens for output changes and updates the display manager. 654 // Listens for output changes and updates the display manager.
648 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_; 655 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 base::ObserverList<ShellObserver> shell_observers_; 699 base::ObserverList<ShellObserver> shell_observers_;
693 700
694 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 701 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
695 702
696 DISALLOW_COPY_AND_ASSIGN(Shell); 703 DISALLOW_COPY_AND_ASSIGN(Shell);
697 }; 704 };
698 705
699 } // namespace ash 706 } // namespace ash
700 707
701 #endif // ASH_SHELL_H_ 708 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_controller.cc ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698