| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WINDOW_ANDROID_H_ | 5 #ifndef UI_BASE_ANDROID_WINDOW_ANDROID_H_ |
| 6 #define UI_ANDROID_WINDOW_ANDROID_H_ | 6 #define UI_BASE_ANDROID_WINDOW_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 #include "base/android/jni_helper.h" | 10 #include "base/android/jni_helper.h" |
| 11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
| 12 #include "ui/base/ui_export.h" | 12 #include "ui/base/ui_export.h" |
| 13 #include "ui/gfx/vector2d_f.h" | 13 #include "ui/gfx/vector2d_f.h" |
| 14 | 14 |
| 15 namespace ui { | 15 namespace ui { |
| 16 | 16 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 38 ~WindowAndroid(); | 38 ~WindowAndroid(); |
| 39 | 39 |
| 40 JavaObjectWeakGlobalRef weak_java_window_; | 40 JavaObjectWeakGlobalRef weak_java_window_; |
| 41 gfx::Vector2dF content_offset_; | 41 gfx::Vector2dF content_offset_; |
| 42 | 42 |
| 43 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); | 43 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); |
| 44 }; | 44 }; |
| 45 | 45 |
| 46 } // namespace ui | 46 } // namespace ui |
| 47 | 47 |
| 48 #endif // UI_ANDROID_WINDOW_ANDROID_H_ | 48 #endif // UI_BASE_ANDROID_WINDOW_ANDROID_H_ |
| OLD | NEW |