| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "ui/base/device_form_factor_android.h" | 5 #include "ui/base/device_form_factor_android.h" |
| 6 | 6 |
| 7 #include "base/android/context_utils.h" |
| 7 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 8 #include "jni/DeviceFormFactor_jni.h" | 9 #include "jni/DeviceFormFactor_jni.h" |
| 9 | 10 |
| 10 namespace ui { | 11 namespace ui { |
| 11 | 12 |
| 12 DeviceFormFactor GetDeviceFormFactor() { | 13 DeviceFormFactor GetDeviceFormFactor() { |
| 13 bool is_tablet = Java_DeviceFormFactor_isTablet( | 14 bool is_tablet = Java_DeviceFormFactor_isTablet( |
| 14 base::android::AttachCurrentThread(), | 15 base::android::AttachCurrentThread(), |
| 15 base::android::GetApplicationContext()); | 16 base::android::GetApplicationContext()); |
| 16 return is_tablet ? DEVICE_FORM_FACTOR_TABLET : DEVICE_FORM_FACTOR_PHONE; | 17 return is_tablet ? DEVICE_FORM_FACTOR_TABLET : DEVICE_FORM_FACTOR_PHONE; |
| 17 } | 18 } |
| 18 | 19 |
| 19 bool RegisterDeviceFormFactorAndroid(JNIEnv* env) { | 20 bool RegisterDeviceFormFactorAndroid(JNIEnv* env) { |
| 20 return RegisterNativesImpl(env); | 21 return RegisterNativesImpl(env); |
| 21 } | 22 } |
| 22 | 23 |
| 23 } // namespace ui | 24 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1475773002:
Add context_utils.h includes where needed. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master