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

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

Issue 2439543003: Do not use overlays when VR shell is enabled. (Closed)
Patch Set: Minor style adjustments Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_DISPLAY_ANDROID_MANAGER_H_ 5 #ifndef UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
6 #define UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_ 6 #define UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 19 matching lines...) Expand all
30 void UpdateDisplay(JNIEnv* env, 30 void UpdateDisplay(JNIEnv* env,
31 const base::android::JavaParamRef<jobject>& jobject, 31 const base::android::JavaParamRef<jobject>& jobject,
32 jint sdkDisplayId, 32 jint sdkDisplayId,
33 jint physicalWidth, 33 jint physicalWidth,
34 jint physicalHeight, 34 jint physicalHeight,
35 jint width, 35 jint width,
36 jint height, 36 jint height,
37 jfloat dipScale, 37 jfloat dipScale,
38 jint rotationDegrees, 38 jint rotationDegrees,
39 jint bitsPerPixel, 39 jint bitsPerPixel,
40 jint bitsPerComponent); 40 jint bitsPerComponent,
41 jboolean isVirtual);
41 void RemoveDisplay(JNIEnv* env, 42 void RemoveDisplay(JNIEnv* env,
42 const base::android::JavaParamRef<jobject>& jobject, 43 const base::android::JavaParamRef<jobject>& jobject,
43 jint sdkDisplayId); 44 jint sdkDisplayId);
44 void SetPrimaryDisplayId(JNIEnv* env, 45 void SetPrimaryDisplayId(JNIEnv* env,
45 const base::android::JavaParamRef<jobject>& jobject, 46 const base::android::JavaParamRef<jobject>& jobject,
46 jint sdkDisplayId); 47 jint sdkDisplayId);
47 48
48 private: 49 private:
49 friend void SetScreenAndroid(); 50 friend void SetScreenAndroid();
50 DisplayAndroidManager(); 51 DisplayAndroidManager();
51 52
52 int primary_display_id_ = 0; 53 int primary_display_id_ = 0;
53 54
54 DISALLOW_COPY_AND_ASSIGN(DisplayAndroidManager); 55 DISALLOW_COPY_AND_ASSIGN(DisplayAndroidManager);
55 }; 56 };
56 57
57 } // namespace ui 58 } // namespace ui
58 59
59 #endif // UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_ 60 #endif // UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698