| 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 {}
|
|
|
|
|