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

Unified Diff: chrome/browser/android/vr_shell/ui_elements/simple_textured_element.h

Issue 2966793002: NOT FOR REVIEW - convert to cc animation
Patch Set: switch to transform operations Created 3 years, 6 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_elements/simple_textured_element.h
diff --git a/chrome/browser/android/vr_shell/ui_elements/simple_textured_element.h b/chrome/browser/android/vr_shell/ui_elements/simple_textured_element.h
index c4467c9b78197571f7d7a88c0c0e17863041813c..ff435d869c5734e79e3ee96f71f0f57ef7d9f158 100644
--- a/chrome/browser/android/vr_shell/ui_elements/simple_textured_element.h
+++ b/chrome/browser/android/vr_shell/ui_elements/simple_textured_element.h
@@ -25,8 +25,8 @@ class SimpleTexturedElement : public TexturedElement {
// |preferred_width| is the element's desired width in meters. Constraints
// implied by the texture being rendered may or may not allow it to be
// rendered exactly at the preferred width.
- explicit SimpleTexturedElement(int maximum_width)
- : TexturedElement(maximum_width), texture_(base::MakeUnique<T>()) {}
+ explicit SimpleTexturedElement(int id, int maximum_width)
+ : TexturedElement(id, maximum_width), texture_(base::MakeUnique<T>()) {}
~SimpleTexturedElement() override {}
T* GetDerivedTexture() { return texture_.get(); }
@@ -42,9 +42,11 @@ class SimpleTexturedElement : public TexturedElement {
template <class T>
class TransientSimpleTexturedElement : public SimpleTexturedElement<T> {
public:
- TransientSimpleTexturedElement(int maximum_width,
+ TransientSimpleTexturedElement(int id,
+ int maximum_width,
const base::TimeDelta& timeout)
- : SimpleTexturedElement<T>(maximum_width), transience_(this, timeout) {}
+ : SimpleTexturedElement<T>(id, maximum_width),
+ transience_(this, timeout) {}
~TransientSimpleTexturedElement() override {}

Powered by Google App Engine
This is Rietveld 408576698