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

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2363553003: VrShell: implement insecure content warning display (Closed)
Patch Set: Josh: lower permanent icon by half its height. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/vr_shell.h
diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
index 012a384b2760ee98ac3c0bf8ce8b680244e4c621..0697568a4c1d54814bce7140b3435277912ab7e1 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -94,13 +94,18 @@ class VrShell : public device::GvrDelegate {
private:
virtual ~VrShell();
void LoadUIContent();
+ bool IsUiTextureReady();
+ Rectf MakeUiGlCopyRect(Recti pixel_rect);
void DrawVrShell();
void DrawEye(const gvr::Mat4f& view_matrix,
const gvr::BufferViewport& params);
- void DrawContentRect();
- void DrawWebVr();
void DrawUI();
void DrawCursor();
+ void DrawWebVr();
+ void DrawWebVrOverlay(int64_t present_time_nanos);
+ void DrawWebVrEye(const gvr::Mat4f& view_matrix,
+ const gvr::BufferViewport& params,
+ int64_t present_time_nanos);
void UpdateController();
@@ -152,7 +157,8 @@ class VrShell : public device::GvrDelegate {
int ui_tex_height_ = 0;
bool webvr_mode_ = false;
- bool webvr_secure_origin_;
+ bool webvr_secure_origin_ = false;
+ int64_t webvr_warning_end_nanos_ = 0;
base::WeakPtrFactory<VrShell> weak_ptr_factory_;
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | chrome/browser/android/vr_shell/vr_shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698