| Index: chrome/browser/android/vr_shell/ui_scene.h
|
| diff --git a/chrome/browser/android/vr_shell/ui_scene.h b/chrome/browser/android/vr_shell/ui_scene.h
|
| index cea660d85d6cf1121602fe1846abb39e2a9db272..0601e502e1a63c0a95535dc360016b5be3884d89 100644
|
| --- a/chrome/browser/android/vr_shell/ui_scene.h
|
| +++ b/chrome/browser/android/vr_shell/ui_scene.h
|
| @@ -30,7 +30,7 @@ class UiScene {
|
| REMOVE_ELEMENT,
|
| ADD_ANIMATION,
|
| REMOVE_ANIMATION,
|
| - UPDATE_BACKGROUND,
|
| + CONFIGURE_SCENE,
|
| };
|
|
|
| UiScene();
|
| @@ -56,8 +56,6 @@ class UiScene {
|
| // Remove |animation_id| from element |element_id|.
|
| void RemoveAnimation(int element_id, int animation_id);
|
|
|
| - void UpdateBackgroundFromDict(const base::DictionaryValue& dict);
|
| -
|
| // Update the positions of all elements in the scene, according to active
|
| // animations and time. The units of time are arbitrary, but must match the
|
| // unit used in animations.
|
| @@ -71,8 +69,10 @@ class UiScene {
|
|
|
| ContentRectangle* GetUiElementById(int element_id);
|
|
|
| - const Colorf& GetBackgroundColor();
|
| - float GetBackgroundDistance();
|
| + const Colorf& GetBackgroundColor() const;
|
| + float GetBackgroundDistance() const;
|
| + bool GetCursorEnabled() const;
|
| + bool GetWebVrRenderingEnabled() const;
|
|
|
| private:
|
| void ApplyRecursiveTransforms(const ContentRectangle& element,
|
| @@ -85,6 +85,8 @@ class UiScene {
|
| ContentRectangle* content_element_ = nullptr;
|
| Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
|
| float background_distance_ = 10.0f;
|
| + bool cursor_enabled_ = false;
|
| + bool webvr_rendering_enabled_ = true;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UiScene);
|
| };
|
|
|