ash/shell.cc - Issue 183853010: Bluetooth: notify user of incoming pairing requests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell.cc

Issue 183853010: Bluetooth: notify user of incoming pairing requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add dependency to hopefully fix linux_chromeos build failure Created 6 years, 10 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:

Index: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 8ed71fe2d43a369a2116155c88ddbf974d5040e3..1d936d7e343d8af210a0f7f8840e0338a7a0eb61 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"

@@ -986,6 +987,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(

« no previous file with comments | « ash/shell.h ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »