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

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

Issue 2807293002: VR: Rename ContentRectangle to UiElement (Closed)
Patch Set: Rebase onto Michael's landed GVR types CL. Created 3 years, 8 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
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 91b0c3ba20a61b8707e937d0e7fddd7adb71c714..23087401750553c773082947328c16164224884a 100644
--- a/chrome/browser/android/vr_shell/ui_scene.h
+++ b/chrome/browser/android/vr_shell/ui_scene.h
@@ -20,7 +20,7 @@ class TimeTicks;
namespace vr_shell {
class Animation;
-struct ContentRectangle;
+struct UiElement;
class UiScene {
public:
@@ -36,7 +36,7 @@ class UiScene {
UiScene();
virtual ~UiScene();
- void AddUiElement(std::unique_ptr<ContentRectangle> element);
+ void AddUiElement(std::unique_ptr<UiElement> element);
// Add a UI element according to a dictionary passed from the UI HTML.
void AddUiElementFromDict(const base::DictionaryValue& dict);
@@ -65,12 +65,12 @@ class UiScene {
void HandleCommands(std::unique_ptr<base::ListValue> commands,
const base::TimeTicks& current_time);
- const std::vector<std::unique_ptr<ContentRectangle>>& GetUiElements() const;
+ const std::vector<std::unique_ptr<UiElement>>& GetUiElements() const;
- ContentRectangle* GetUiElementById(int element_id);
+ UiElement* GetUiElementById(int element_id);
- std::vector<const ContentRectangle*> GetWorldElements() const;
- std::vector<const ContentRectangle*> GetHeadLockedElements() const;
+ std::vector<const UiElement*> GetWorldElements() const;
+ std::vector<const UiElement*> GetHeadLockedElements() const;
bool HasVisibleHeadLockedElements() const;
const vr::Colorf& GetBackgroundColor() const;
@@ -78,12 +78,12 @@ class UiScene {
bool GetWebVrRenderingEnabled() const;
private:
- void ApplyRecursiveTransforms(ContentRectangle* element);
+ void ApplyRecursiveTransforms(UiElement* element);
void ApplyDictToElement(const base::DictionaryValue& dict,
- ContentRectangle* element);
+ UiElement* element);
- std::vector<std::unique_ptr<ContentRectangle>> ui_elements_;
- ContentRectangle* content_element_ = nullptr;
+ std::vector<std::unique_ptr<UiElement>> ui_elements_;
+ UiElement* content_element_ = nullptr;
vr::Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
float background_distance_ = 10.0f;
bool webvr_rendering_enabled_ = true;
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements_unittest.cc ('k') | chrome/browser/android/vr_shell/ui_scene.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698