 Chromium Code Reviews
 Chromium Code Reviews Issue 2887773008:
  Update fullscreen ux, make floor and ceiling visible.  (Closed)
    
  
    Issue 2887773008:
  Update fullscreen ux, make floor and ceiling visible.  (Closed) 
  | OLD | NEW | 
|---|---|
| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 void OnCloseButtonClicked(); | 59 void OnCloseButtonClicked(); | 
| 60 int AllocateId(); | 60 int AllocateId(); | 
| 61 | 61 | 
| 62 VrBrowserInterface* browser_; | 62 VrBrowserInterface* browser_; | 
| 63 UiScene* scene_; | 63 UiScene* scene_; | 
| 64 | 64 | 
| 65 // UI element pointers (not owned by the scene manager). | 65 // UI element pointers (not owned by the scene manager). | 
| 66 UiElement* permanent_security_warning_ = nullptr; | 66 UiElement* permanent_security_warning_ = nullptr; | 
| 67 UiElement* transient_security_warning_ = nullptr; | 67 UiElement* transient_security_warning_ = nullptr; | 
| 68 UiElement* main_content_ = nullptr; | 68 UiElement* main_content_ = nullptr; | 
| 69 UiElement* ceiling_ = nullptr; | |
| 
cjgrant
2017/05/18 16:07:16
It really is looking like scene manager should own
 
amp
2017/05/18 16:15:33
I threw this together to get it working quickly in
 | |
| 70 UiElement* floor_ = nullptr; | |
| 71 UiElement* floor_grid_ = nullptr; | |
| 69 UiElement* audio_input_indicator_ = nullptr; | 72 UiElement* audio_input_indicator_ = nullptr; | 
| 70 UiElement* video_input_indicator_ = nullptr; | 73 UiElement* video_input_indicator_ = nullptr; | 
| 71 UrlBar* url_bar_ = nullptr; | 74 UrlBar* url_bar_ = nullptr; | 
| 72 LoadingIndicator* loading_indicator_ = nullptr; | 75 LoadingIndicator* loading_indicator_ = nullptr; | 
| 73 | 76 | 
| 74 bool in_cct_; | 77 bool in_cct_; | 
| 75 bool web_vr_mode_; | 78 bool web_vr_mode_; | 
| 76 bool secure_origin_ = false; | 79 bool secure_origin_ = false; | 
| 77 bool fullscreen_ = false; | 80 bool fullscreen_ = false; | 
| 78 | 81 | 
| 79 int next_available_id_ = 1; | 82 int next_available_id_ = 1; | 
| 80 | 83 | 
| 81 std::vector<UiElement*> content_elements_; | 84 std::vector<UiElement*> content_elements_; | 
| 82 std::vector<UiElement*> control_elements_; | 85 std::vector<UiElement*> control_elements_; | 
| 83 | 86 | 
| 84 base::OneShotTimer security_warning_timer_; | 87 base::OneShotTimer security_warning_timer_; | 
| 85 | 88 | 
| 86 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; | 89 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; | 
| 87 | 90 | 
| 88 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); | 91 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); | 
| 89 }; | 92 }; | 
| 90 | 93 | 
| 91 } // namespace vr_shell | 94 } // namespace vr_shell | 
| 92 | 95 | 
| 93 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ | 96 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ | 
| OLD | NEW |