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

Side by Side Diff: chrome/browser/android/vr_shell/ui_scene_manager.h

Issue 2834543006: Hook up insecure content warnings for http webVR presentation. (Closed)
Patch Set: rebase Created 3 years, 8 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 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 CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 10 matching lines...) Expand all
21 ~UiSceneManager(); 21 ~UiSceneManager();
22 22
23 base::WeakPtr<UiSceneManager> GetWeakPtr(); 23 base::WeakPtr<UiSceneManager> GetWeakPtr();
24 24
25 void SetWebVRSecureOrigin(bool secure); 25 void SetWebVRSecureOrigin(bool secure);
26 void SetWebVRMode(bool web_vr); 26 void SetWebVRMode(bool web_vr);
27 27
28 private: 28 private:
29 void ConfigureSecurityWarnings(); 29 void ConfigureSecurityWarnings();
30 void OnSecurityWarningTimer(); 30 void OnSecurityWarningTimer();
31 void OnGLInitialized();
31 32
32 UiScene* scene_; 33 UiScene* scene_;
33 34
34 // UI elemenet pointers (not owned by the scene manager). 35 // UI element pointers (not owned by the scene manager).
35 UiElement* permanent_security_warning_ = nullptr; 36 UiElement* permanent_security_warning_ = nullptr;
36 UiElement* transient_security_warning_ = nullptr; 37 UiElement* transient_security_warning_ = nullptr;
37 UiElement* main_content_ = nullptr; 38 UiElement* main_content_ = nullptr;
38 39
39 bool web_vr_mode_ = false; 40 bool web_vr_mode_ = false;
40 bool secure_origin_ = false; 41 bool secure_origin_ = false;
41 42
42 base::OneShotTimer security_warning_timer_; 43 base::OneShotTimer security_warning_timer_;
43 44
44 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 45 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 47 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
47 }; 48 };
48 49
49 } // namespace vr_shell 50 } // namespace vr_shell
50 51
51 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 52 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene.cc ('k') | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698