Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: ui/base/android/window_android.h

Issue 762063006: Revert of Revert of Cleanup: Update the path to vector2d_f.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/test/test_render_view_host.h ('k') | ui/gfx/transform.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef UI_BASE_ANDROID_WINDOW_ANDROID_H_ 5 #ifndef UI_BASE_ANDROID_WINDOW_ANDROID_H_
6 #define UI_BASE_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
10 #include "base/android/jni_weak_ref.h" 11 #include "base/android/jni_weak_ref.h"
11 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
12 #include "base/observer_list.h" 13 #include "base/observer_list.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "ui/base/ui_base_export.h" 15 #include "ui/base/ui_base_export.h"
15 #include "ui/gfx/vector2d_f.h" 16 #include "ui/gfx/geometry/vector2d_f.h"
16 17
17 namespace ui { 18 namespace ui {
18 19
19 class WindowAndroidCompositor; 20 class WindowAndroidCompositor;
20 class WindowAndroidObserver; 21 class WindowAndroidObserver;
21 22
22 // Android implementation of the activity window. 23 // Android implementation of the activity window.
23 class UI_BASE_EXPORT WindowAndroid { 24 class UI_BASE_EXPORT WindowAndroid {
24 public: 25 public:
25 WindowAndroid(JNIEnv* env, jobject obj); 26 WindowAndroid(JNIEnv* env, jobject obj);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 WindowAndroidCompositor* compositor_; 68 WindowAndroidCompositor* compositor_;
68 69
69 ObserverList<WindowAndroidObserver> observer_list_; 70 ObserverList<WindowAndroidObserver> observer_list_;
70 71
71 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); 72 DISALLOW_COPY_AND_ASSIGN(WindowAndroid);
72 }; 73 };
73 74
74 } // namespace ui 75 } // namespace ui
75 76
76 #endif // UI_BASE_ANDROID_WINDOW_ANDROID_H_ 77 #endif // UI_BASE_ANDROID_WINDOW_ANDROID_H_
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.h ('k') | ui/gfx/transform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698