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

Side by Side Diff: content/content_browser.gypi

Issue 1502663003: bluetooth: Implement allowed devices map (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Fix merge conflicts Created 4 years, 11 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
« no previous file with comments | « content/common/bluetooth/bluetooth_messages.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base_static', 7 '../base/base.gyp:base_static',
8 '../components/url_formatter/url_formatter.gyp:url_formatter', 8 '../components/url_formatter/url_formatter.gyp:url_formatter',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../device/battery/battery.gyp:device_battery', 10 '../device/battery/battery.gyp:device_battery',
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 'browser/background_sync/background_sync_registration.h', 431 'browser/background_sync/background_sync_registration.h',
432 'browser/background_sync/background_sync_registration_handle.cc', 432 'browser/background_sync/background_sync_registration_handle.cc',
433 'browser/background_sync/background_sync_registration_handle.h', 433 'browser/background_sync/background_sync_registration_handle.h',
434 'browser/background_sync/background_sync_registration_options.cc', 434 'browser/background_sync/background_sync_registration_options.cc',
435 'browser/background_sync/background_sync_registration_options.h', 435 'browser/background_sync/background_sync_registration_options.h',
436 'browser/background_sync/background_sync_service_impl.cc', 436 'browser/background_sync/background_sync_service_impl.cc',
437 'browser/background_sync/background_sync_service_impl.h', 437 'browser/background_sync/background_sync_service_impl.h',
438 'browser/background_sync/background_sync_status.h', 438 'browser/background_sync/background_sync_status.h',
439 'browser/bad_message.cc', 439 'browser/bad_message.cc',
440 'browser/bad_message.h', 440 'browser/bad_message.h',
441 'browser/bluetooth/bluetooth_allowed_devices_map.cc',
442 'browser/bluetooth/bluetooth_allowed_devices_map.h',
441 'browser/bluetooth/bluetooth_dispatcher_host.cc', 443 'browser/bluetooth/bluetooth_dispatcher_host.cc',
442 'browser/bluetooth/bluetooth_dispatcher_host.h', 444 'browser/bluetooth/bluetooth_dispatcher_host.h',
443 'browser/bluetooth/bluetooth_metrics.cc', 445 'browser/bluetooth/bluetooth_metrics.cc',
444 'browser/bluetooth/bluetooth_metrics.h', 446 'browser/bluetooth/bluetooth_metrics.h',
445 'browser/bluetooth/first_device_bluetooth_chooser.cc', 447 'browser/bluetooth/first_device_bluetooth_chooser.cc',
446 'browser/bluetooth/first_device_bluetooth_chooser.h', 448 'browser/bluetooth/first_device_bluetooth_chooser.h',
447 'browser/bootstrap_sandbox_manager_mac.cc', 449 'browser/bootstrap_sandbox_manager_mac.cc',
448 'browser/bootstrap_sandbox_manager_mac.h', 450 'browser/bootstrap_sandbox_manager_mac.h',
449 'browser/browser_child_process_host_impl.cc', 451 'browser/browser_child_process_host_impl.cc',
450 'browser/browser_child_process_host_impl.h', 452 'browser/browser_child_process_host_impl.h',
(...skipping 1758 matching lines...) Expand 10 before | Expand all | Expand 10 after
2209 ['enable_webvr==1 and OS=="android"', { 2211 ['enable_webvr==1 and OS=="android"', {
2210 'sources': [ 2212 'sources': [
2211 'browser/vr/android/cardboard/cardboard_vr_device.cc', 2213 'browser/vr/android/cardboard/cardboard_vr_device.cc',
2212 'browser/vr/android/cardboard/cardboard_vr_device.h', 2214 'browser/vr/android/cardboard/cardboard_vr_device.h',
2213 'browser/vr/android/cardboard/cardboard_vr_device_provider.cc', 2215 'browser/vr/android/cardboard/cardboard_vr_device_provider.cc',
2214 'browser/vr/android/cardboard/cardboard_vr_device_provider.h', 2216 'browser/vr/android/cardboard/cardboard_vr_device_provider.h',
2215 ], 2217 ],
2216 }], 2218 }],
2217 ], 2219 ],
2218 } 2220 }
OLDNEW
« no previous file with comments | « content/common/bluetooth/bluetooth_messages.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698