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

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

Issue 2955483003: Show splash screen when entering VR from a deep-link (Closed)
Patch Set: fix compile error on bots Created 3 years, 5 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_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 SkColor GetWorldBackgroundColor() const; 73 SkColor GetWorldBackgroundColor() const;
74 74
75 void SetBackgroundDistance(float distance); 75 void SetBackgroundDistance(float distance);
76 float GetBackgroundDistance() const; 76 float GetBackgroundDistance() const;
77 77
78 bool GetWebVrRenderingEnabled() const; 78 bool GetWebVrRenderingEnabled() const;
79 void SetWebVrRenderingEnabled(bool enabled); 79 void SetWebVrRenderingEnabled(bool enabled);
80 80
81 bool is_exiting() const { return is_exiting_; } 81 bool is_exiting() const { return is_exiting_; }
82 void set_is_exiting(); 82 void set_is_exiting();
83 bool is_prompting_to_exit() { return is_prompting_to_exit_; } 83 bool is_prompting_to_exit() const { return is_prompting_to_exit_; }
84 void set_is_prompting_to_exit(bool prompting); 84 void set_is_prompting_to_exit(bool prompting);
85 bool showing_splash_screen() const { return showing_splash_screen_; }
86 void set_showing_splash_screen(bool showing);
85 87
86 void OnGLInitialized(); 88 void OnGLInitialized();
87 89
88 private: 90 private:
89 void Animate(const base::TimeTicks& current_time); 91 void Animate(const base::TimeTicks& current_time);
90 void ApplyRecursiveTransforms(UiElement* element); 92 void ApplyRecursiveTransforms(UiElement* element);
91 93
92 std::vector<std::unique_ptr<UiElement>> ui_elements_; 94 std::vector<std::unique_ptr<UiElement>> ui_elements_;
93 UiElement* content_element_ = nullptr; 95 UiElement* content_element_ = nullptr;
94 ColorScheme::Mode mode_ = ColorScheme::kModeNormal; 96 ColorScheme::Mode mode_ = ColorScheme::kModeNormal;
95 97
96 float background_distance_ = 10.0f; 98 float background_distance_ = 10.0f;
97 bool webvr_rendering_enabled_ = true; 99 bool webvr_rendering_enabled_ = true;
98 bool gl_initialized_ = false; 100 bool gl_initialized_ = false;
99 bool is_exiting_ = false; 101 bool is_exiting_ = false;
100 bool is_prompting_to_exit_ = false; 102 bool is_prompting_to_exit_ = false;
103 bool showing_splash_screen_ = false;
101 104
102 DISALLOW_COPY_AND_ASSIGN(UiScene); 105 DISALLOW_COPY_AND_ASSIGN(UiScene);
103 }; 106 };
104 107
105 } // namespace vr_shell 108 } // namespace vr_shell
106 109
107 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ 110 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_interface.h ('k') | chrome/browser/android/vr_shell/ui_scene.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698