chrome/chrome_browser_chromeos.gypi - Issue 11075006: Moved bluetooth adapter files to device/bluetooth/.

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: chrome/chrome_browser_chromeos.gypi

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix so that this CL compiles on Windows. Created 8 years, 2 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 | « chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | device/bluetooth/bluetooth_adapter_chromeos.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser_chromeos.gypi

diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi

index c1e7d0485ac10bd652e9553ba24c180c77ca1955..968c8edb599c4b877885785fe9ba495d4fa2fac5 100644

--- a/chrome/chrome_browser_chromeos.gypi

+++ b/chrome/chrome_browser_chromeos.gypi

@@ -53,6 +53,7 @@

'../content/content.gyp:content_common',

'../crypto/crypto.gyp:crypto',

'../dbus/dbus.gyp:dbus',

+ '../device/device.gyp:bluetooth',

'../media/media.gyp:media',

'../net/net.gyp:net',

'../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin

@@ -126,23 +127,6 @@

'browser/chromeos/audio/audio_mixer_cras.h',

'browser/chromeos/background/ash_user_wallpaper_delegate.cc',

'browser/chromeos/background/ash_user_wallpaper_delegate.h',

- 'browser/chromeos/bluetooth/bluetooth_adapter.cc',

- 'browser/chromeos/bluetooth/bluetooth_adapter.h',

- 'browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc',

- 'browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h',

- 'browser/chromeos/bluetooth/bluetooth_adapter_factory.h',

- 'browser/chromeos/bluetooth/bluetooth_adapter_factory.cc',

- 'browser/chromeos/bluetooth/bluetooth_device.cc',

- 'browser/chromeos/bluetooth/bluetooth_device.h',

- 'browser/chromeos/bluetooth/bluetooth_device_chromeos.cc',

- 'browser/chromeos/bluetooth/bluetooth_device_chromeos.h',

- 'browser/chromeos/bluetooth/bluetooth_service_record.cc',

- 'browser/chromeos/bluetooth/bluetooth_service_record.h',

- 'browser/chromeos/bluetooth/bluetooth_socket.h',

- 'browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc',

- 'browser/chromeos/bluetooth/bluetooth_socket_chromeos.h',

- 'browser/chromeos/bluetooth/bluetooth_utils.cc',

- 'browser/chromeos/bluetooth/bluetooth_utils.h',

'browser/chromeos/boot_times_loader.cc',

'browser/chromeos/boot_times_loader.h',

'browser/chromeos/choose_mobile_network_dialog.cc',

@@ -272,8 +256,6 @@

'browser/chromeos/enrollment_dialog_view.h',

'browser/chromeos/enterprise_extension_observer.cc',

'browser/chromeos/enterprise_extension_observer.h',

- 'browser/chromeos/extensions/bluetooth_event_router.cc',

- 'browser/chromeos/extensions/bluetooth_event_router.h',

'browser/chromeos/extensions/echo_private_api.cc',

'browser/chromeos/extensions/echo_private_api.h',

'browser/chromeos/extensions/file_browser_event_router.cc',