| 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 4bcb6d88d29a490db659f71ee6a5720adfad48f4..55a57b1d828692a53f809761471f593f0de1fb62 100644
|
| --- a/chrome/browser/android/vr_shell/ui_scene.h
|
| +++ b/chrome/browser/android/vr_shell/ui_scene.h
|
| @@ -9,7 +9,7 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "chrome/browser/android/vr_shell/vr_math.h"
|
| +#include "device/vr/vr_types.h"
|
|
|
| namespace base {
|
| class DictionaryValue;
|
| @@ -72,7 +72,7 @@ class UiScene {
|
| std::vector<const ContentRectangle*> GetHeadLockedElements() const;
|
| bool HasVisibleHeadLockedElements() const;
|
|
|
| - const Colorf& GetBackgroundColor() const;
|
| + const vr::Colorf& GetBackgroundColor() const;
|
| float GetBackgroundDistance() const;
|
| bool GetWebVrRenderingEnabled() const;
|
|
|
| @@ -83,7 +83,7 @@ class UiScene {
|
|
|
| std::vector<std::unique_ptr<ContentRectangle>> ui_elements_;
|
| ContentRectangle* content_element_ = nullptr;
|
| - Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
|
| + vr::Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
|
| float background_distance_ = 10.0f;
|
| bool webvr_rendering_enabled_ = true;
|
|
|
|
|