chrome/browser/chromeos/bluetooth/bluetooth_device.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

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/browser/chromeos/bluetooth/bluetooth_device.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 8 years, 8 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: chrome/browser/chromeos/bluetooth/bluetooth_device.cc

diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc

index d5c7a708169a0e93a0258c61c5d5209f57ebdad9..6901be613feb389354cf3ad71b1f2118a7a2e8b7 100644

--- a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc

+++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc

@@ -14,13 +14,13 @@

#include "base/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"

-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"

-#include "chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h"

-#include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"

-#include "chrome/browser/chromeos/dbus/bluetooth_input_client.h"

-#include "chrome/browser/chromeos/dbus/introspectable_client.h"

#include "chrome/browser/chromeos/dbus/introspect_util.h"

-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

+#include "chromeos/dbus/bluetooth_adapter_client.h"

+#include "chromeos/dbus/bluetooth_agent_service_provider.h"

+#include "chromeos/dbus/bluetooth_device_client.h"

+#include "chromeos/dbus/bluetooth_input_client.h"

+#include "chromeos/dbus/dbus_thread_manager.h"

+#include "chromeos/dbus/introspectable_client.h"

#include "dbus/bus.h"

#include "dbus/object_path.h"

#include "grit/generated_resources.h"