diff options
| author | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 06:59:50 +0000 |
|---|---|---|
| committer | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 06:59:50 +0000 |
| commit | b314272591420e941281d56e96079756b334c404 (patch) | |
| tree | 41ab73dbaf890dd87f1610c707defff67a50a857 /ash/shell.cc | |
| parent | 90be8cd625f609af86d135ef4e54503360699efa (diff) | |
| download | chromium_src-b314272591420e941281d56e96079756b334c404.zip chromium_src-b314272591420e941281d56e96079756b334c404.tar.gz chromium_src-b314272591420e941281d56e96079756b334c404.tar.bz2 | |
Bluetooth: notify user of incoming pairing requests
Implement a low-priority pairing delegate in the form of an Aura Status
Tray Notification Controller that displays a rich notification when an
incoming pairing request is received and allows the user to accept or
reject it when appropriate.
BUG=345535
TESTS=chromeos=1 on Linux presents fake pairing requests
Review URL: https://codereview.chromium.org/183853010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index f1a037b..b46ad3f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -129,6 +129,7 @@ #endif // defined(USE_X11) #include "ash/display/resolution_notification_controller.h" #include "ash/sticky_keys/sticky_keys_controller.h" +#include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" #include "ash/system/chromeos/power/power_event_observer.h" #include "ash/system/chromeos/power/power_status.h" @@ -998,6 +999,8 @@ void Shell::Init() { new internal::UserActivityNotifier(user_activity_detector_.get())); video_activity_notifier_.reset( new internal::VideoActivityNotifier(video_detector_.get())); + bluetooth_notification_controller_.reset( + new internal::BluetoothNotificationController); #endif weak_display_manager_factory_.reset( |