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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 0969556b1b5cee797b4e95995d49fe9915369b4a..873d4356ae0ea9262deef78c1b189fde9f5aab18 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -128,6 +128,7 @@ class ResizeShadowController;
class ResolutionNotificationController;
class RootWindowController;
class ScopedOverviewAnimationSettingsFactoryAura;
+class ScreenLayoutObserver;
class ScreenOrientationController;
class ScreenshotController;
class ScreenPinningController;
@@ -145,8 +146,8 @@ class SystemTray;
class SystemTrayController;
class SystemTrayDelegate;
class ToplevelWindowEventHandler;
-class ScreenLayoutObserver;
class ToastManager;
+class TrayBluetoothHelper;
class VirtualKeyboardController;
class VideoActivityNotifier;
class VideoDetector;
@@ -438,6 +439,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return screen_orientation_controller_.get();
}
+ TrayBluetoothHelper* tray_bluetooth_helper() {
+ return tray_bluetooth_helper_.get();
+ }
+
VirtualKeyboardController* virtual_keyboard_controller() {
return virtual_keyboard_controller_.get();
}
@@ -680,6 +685,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
resolution_notification_controller_;
std::unique_ptr<BluetoothNotificationController>
bluetooth_notification_controller_;
+ std::unique_ptr<TrayBluetoothHelper> tray_bluetooth_helper_;
std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
// Controls video output device state.
« 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