VR: System indicator rework.

chrome/browser/android/vr_shell/textures/system_indicator_texture.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/textures/system_indicator_texture.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/skia_paint_canvas.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 26 matching lines @@
     : icon_(icon), has_text_(false) {}
 
 SystemIndicatorTexture::~SystemIndicatorTexture() = default;
 
 void SystemIndicatorTexture::Draw(SkCanvas* sk_canvas,
                                   const gfx::Size& texture_size) {
   cc::SkiaPaintCanvas paint_canvas(sk_canvas);
   gfx::Canvas gfx_canvas(&paint_canvas, 1.0f);
   gfx::Canvas* canvas = &gfx_canvas;
 
-  DCHECK(texture_size.height() * kHeightWidthRatio == texture_size.width());
   size_.set_height(texture_size.height());
+
   SkPaint paint;
   paint.setColor(color_scheme().system_indicator_background);
 
   gfx::Rect text_size(0, 0);
   std::vector<std::unique_ptr<gfx::RenderText>> lines;
 
   if (has_text_) {
     base::string16 text = l10n_util::GetStringUTF16(message_id_);
 
     gfx::FontList fonts;
@@ skipping 33 matching lines @@
       size_.height() *
           (IsRTL() ? 2 * kBorderFactor : 3 * kBorderFactor + kIconSizeFactor),
       size_.height() * kBorderFactor));
   for (auto& render_text : lines)
     render_text->Draw(canvas);
   canvas->Restore();
 }
 
 gfx::Size SystemIndicatorTexture::GetPreferredTextureSize(
     int maximum_width) const {
-  // Ensuring height is a quarter of the width.
+  // All indicators need to be the same height, so compute height, and then
+  // re-compute with based on whether the indicator has text or not.
   int height = maximum_width / kHeightWidthRatio;
-  return gfx::Size(height * kHeightWidthRatio, height);
+  return gfx::Size(has_text_ ? maximum_width : height, height);
 }
 
 gfx::SizeF SystemIndicatorTexture::GetDrawnSize() const {
   return size_;
 }
 
 }  // namespace vr_shell