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

Unified Diff: ash/ash.gyp

Issue 183853010: Bluetooth: notify user of incoming pairing requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add bluetooth as ash_shell dependency on chromeos 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:
View side-by-side diff with in-line comments
Download patch
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 86ca02290612b13a28123df5ee109527b7eb6932..ed5db2c53117595ec9dee4ca3ea9fcd66deabb24 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -288,6 +288,8 @@
'system/chromeos/audio/tray_audio_delegate_chromeos.cc',
'system/chromeos/audio/tray_audio_delegate_chromeos.h',
'system/chromeos/enterprise/enterprise_domain_observer.h',
+ 'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
+ 'system/chromeos/bluetooth/bluetooth_notification_controller.h',
'system/chromeos/brightness/brightness_controller_chromeos.cc',
'system/chromeos/brightness/brightness_controller_chromeos.h',
'system/chromeos/brightness/tray_brightness.cc',
@@ -1009,6 +1011,7 @@
['chromeos==1', {
'dependencies': [
'../chromeos/chromeos.gyp:power_manager_proto',
+ '../device/bluetooth/bluetooth.gyp:device_bluetooth',
],
'sources': [
'first_run/first_run_helper_unittest.cc',
@@ -1108,6 +1111,11 @@
'../sandbox/sandbox.gyp:sandbox',
],
}],
+ ['chromeos==1', {
+ 'dependencies': [
+ '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+ ],
+ }],
],
},
],

Powered by Google App Engine
This is Rietveld 408576698