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

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

Issue 1409833004: Add DeviceDisplayInfo getter in WindowAndroid. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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
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_ANDROID_WINDOW_ANDROID_H_ 5 #ifndef UI_ANDROID_WINDOW_ANDROID_H_
6 #define UI_ANDROID_WINDOW_ANDROID_H_ 6 #define UI_ANDROID_WINDOW_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/android/jni_weak_ref.h" 12 #include "base/android/jni_weak_ref.h"
13 #include "base/android/scoped_java_ref.h" 13 #include "base/android/scoped_java_ref.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "ui/android/ui_android_export.h" 16 #include "ui/android/ui_android_export.h"
17 #include "ui/gfx/geometry/vector2d_f.h" 17 #include "ui/gfx/geometry/vector2d_f.h"
18 18
19 namespace gfx {
20 class DeviceDisplayInfo;
21 }
22
19 namespace ui { 23 namespace ui {
20 24
21 class WindowAndroidCompositor; 25 class WindowAndroidCompositor;
22 class WindowAndroidObserver; 26 class WindowAndroidObserver;
23 27
24 // Android implementation of the activity window. 28 // Android implementation of the activity window.
25 class UI_ANDROID_EXPORT WindowAndroid { 29 class UI_ANDROID_EXPORT WindowAndroid {
26 public: 30 public:
27 WindowAndroid(JNIEnv* env, jobject obj); 31 WindowAndroid(JNIEnv* env, jobject obj);
28 32
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 jlong period_micros); 66 jlong period_micros);
63 void OnVisibilityChanged(JNIEnv* env, jobject obj, bool visible); 67 void OnVisibilityChanged(JNIEnv* env, jobject obj, bool visible);
64 void OnActivityStopped(JNIEnv* env, jobject obj); 68 void OnActivityStopped(JNIEnv* env, jobject obj);
65 void OnActivityStarted(JNIEnv* env, jobject obj); 69 void OnActivityStarted(JNIEnv* env, jobject obj);
66 70
67 // Return whether the specified Android permission is granted. 71 // Return whether the specified Android permission is granted.
68 bool HasPermission(const std::string& permission); 72 bool HasPermission(const std::string& permission);
69 // Return whether the specified Android permission can be requested by Chrome. 73 // Return whether the specified Android permission can be requested by Chrome.
70 bool CanRequestPermission(const std::string& permission); 74 bool CanRequestPermission(const std::string& permission);
71 75
76 const gfx::DeviceDisplayInfo& GetDeviceDisplayInfo();
77
72 private: 78 private:
73 ~WindowAndroid(); 79 ~WindowAndroid();
74 80
75 base::android::ScopedJavaGlobalRef<jobject> java_window_; 81 base::android::ScopedJavaGlobalRef<jobject> java_window_;
76 gfx::Vector2dF content_offset_; 82 gfx::Vector2dF content_offset_;
77 WindowAndroidCompositor* compositor_; 83 WindowAndroidCompositor* compositor_;
78 84
79 base::ObserverList<WindowAndroidObserver> observer_list_; 85 base::ObserverList<WindowAndroidObserver> observer_list_;
86 // TODO(gsennton) update display info on screen orientation updates
jdduke (slow) 2015/10/21 17:18:25 Nit: "TODO(gsennton): Update... updates."
gsennton 2015/10/22 11:17:27 Done.
87 scoped_ptr<gfx::DeviceDisplayInfo> device_display_info_;
80 88
81 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); 89 DISALLOW_COPY_AND_ASSIGN(WindowAndroid);
82 }; 90 };
83 91
84 } // namespace ui 92 } // namespace ui
85 93
86 #endif // UI_ANDROID_WINDOW_ANDROID_H_ 94 #endif // UI_ANDROID_WINDOW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698