| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #ifndef UI_ANDROID_VIEW_ANDROID_H_ | 5 #ifndef UI_BASE_ANDROID_VIEW_ANDROID_H_ |
| 6 #define UI_ANDROID_VIEW_ANDROID_H_ | 6 #define UI_BASE_ANDROID_VIEW_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include "base/android/jni_helper.h" | 9 #include "base/android/jni_helper.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| 11 #include "ui/base/ui_export.h" | 11 #include "ui/base/ui_export.h" |
| 12 | 12 |
| 13 namespace ui { | 13 namespace ui { |
| 14 | 14 |
| 15 class WindowAndroid; | 15 class WindowAndroid; |
| 16 | 16 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 31 private: | 31 private: |
| 32 ~ViewAndroid(); | 32 ~ViewAndroid(); |
| 33 JavaObjectWeakGlobalRef weak_java_view_; | 33 JavaObjectWeakGlobalRef weak_java_view_; |
| 34 WindowAndroid* window_android_; | 34 WindowAndroid* window_android_; |
| 35 | 35 |
| 36 DISALLOW_COPY_AND_ASSIGN(ViewAndroid); | 36 DISALLOW_COPY_AND_ASSIGN(ViewAndroid); |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 } // namespace ui | 39 } // namespace ui |
| 40 | 40 |
| 41 #endif // UI_ANDROID_VIEW_ANDROID_H_ | 41 #endif // UI_BASE_ANDROID_VIEW_ANDROID_H_ |
| OLD | NEW |