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

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

Issue 2877133002: VR: Add a loading indicator to the scene. (Closed)
Patch Set: Rebase onto render text change. Created 3 years, 7 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
« no previous file with comments | « chrome/browser/android/vr_shell/ui_interface.h ('k') | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/ui_scene_manager.h
diff --git a/chrome/browser/android/vr_shell/ui_scene_manager.h b/chrome/browser/android/vr_shell/ui_scene_manager.h
index 3d54ad7371eb04f14a2c0cd9281deb65bddca699..81e7f5e56a7ca1d7359ae320de47557ede3ff634 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.h
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.h
@@ -15,6 +15,7 @@ class GURL;
namespace vr_shell {
+class LoadingIndicator;
class UiElement;
class UiScene;
class UrlBar;
@@ -37,7 +38,7 @@ class UiSceneManager {
// These methods are currently stubbed.
void SetSecurityLevel(int level);
void SetLoading(bool loading);
- void SetLoadProgress(double progress);
+ void SetLoadProgress(float progress);
void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward);
void OnAppButtonClicked();
@@ -50,6 +51,7 @@ class UiSceneManager {
void CreateUrlBar();
void CreateCloseButton();
+ void ConfigureScene();
void ConfigureSecurityWarnings();
void OnSecurityWarningTimer();
void OnBackButtonClicked();
@@ -64,14 +66,17 @@ class UiSceneManager {
UiElement* transient_security_warning_ = nullptr;
UiElement* main_content_ = nullptr;
UrlBar* url_bar_ = nullptr;
+ LoadingIndicator* loading_indicator_ = nullptr;
bool in_cct_;
bool web_vr_mode_;
bool secure_origin_ = false;
+ bool fullscreen_ = false;
int next_available_id_ = 1;
- std::vector<UiElement*> browser_ui_elements_;
+ std::vector<UiElement*> content_elements_;
+ std::vector<UiElement*> control_elements_;
base::OneShotTimer security_warning_timer_;
« no previous file with comments | « chrome/browser/android/vr_shell/ui_interface.h ('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