summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authortorne <torne@chromium.org>2015-11-25 10:25:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-25 18:27:27 +0000
commitda6e7c9eab6317710168ba6a2588f68621c8668f (patch)
treec1a4e357e2067a7d2983a0656420fd21febec6d5 /device
parent5f97c7a06a9b78797754a3fdd83d1f6169fb13c9 (diff)
downloadchromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.zip
chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.tar.gz
chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.tar.bz2
Add context_utils.h includes where needed.
base::android::GetApplicationContext is now defined in context_utils.h. Update includes for files that use this, and stop including it in jni_android.h. BUG=552419 TBR=jochen@chromium.org,sky@chromium.org,xhwang@chromium.org,davidben@chromium.org,tedchoc@chromium.org,scheib@chromium.org,qinmin@chromium.org,halliwell@chromium.org,thakis@chromium.org Review URL: https://codereview.chromium.org/1475773002 Cr-Commit-Position: refs/heads/master@{#361701}
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/android/wrappers.cc1
-rw-r--r--device/bluetooth/bluetooth_device_android.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/device/bluetooth/android/wrappers.cc b/device/bluetooth/android/wrappers.cc
index 803a156..746eb25 100644
--- a/device/bluetooth/android/wrappers.cc
+++ b/device/bluetooth/android/wrappers.cc
@@ -4,6 +4,7 @@
#include "device/bluetooth/android/wrappers.h"
+#include "base/android/context_utils.h"
#include "base/android/jni_android.h"
#include "jni/Wrappers_jni.h"
diff --git a/device/bluetooth/bluetooth_device_android.cc b/device/bluetooth/bluetooth_device_android.cc
index e817350..51d11fc 100644
--- a/device/bluetooth/bluetooth_device_android.cc
+++ b/device/bluetooth/bluetooth_device_android.cc
@@ -4,6 +4,7 @@
#include "device/bluetooth/bluetooth_device_android.h"
+#include "base/android/context_utils.h"
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"