VR: Properly space multiple system indicators across the screen.

chrome/browser/android/vr_shell/ui_scene_manager.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/ui_scene_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
@@ skipping 578 matching lines @@
   audio_capture_indicator_->set_visible(allowed && audio_capturing_);
   video_capture_indicator_->set_visible(allowed && video_capturing_);
   screen_capture_indicator_->set_visible(allowed && screen_capturing_);
   location_access_indicator_->set_visible(allowed && location_access_);
 
   if (!allowed)
     return;
 
   // Position elements dynamically relative to each other, based on which
   // indicators are showing, and how big each one is.
-  float total_width = kIndicatorGap * (system_indicators_.size() - 1);
+  float total_width = 0;
   for (const UiElement* indicator : system_indicators_) {
-    if (indicator->visible())
+    if (indicator->visible()) {
+      if (total_width > 0)
+        total_width += kIndicatorGap;
       total_width += indicator->size().x();
+    }
   }
   float x_position = -total_width / 2;
   for (UiElement* indicator : system_indicators_) {
     if (!indicator->visible())
       continue;
     float width = indicator->size().x();
     indicator->set_translation({x_position + width / 2,
                                 kIndicatorVerticalOffset,
                                 kIndicatorDistanceOffset});
     x_position += width + kIndicatorGap;
@@ skipping 127 matching lines @@
   if (fullscreen_)
     return ColorScheme::kModeFullscreen;
   return ColorScheme::kModeNormal;
 }
 
 const ColorScheme& UiSceneManager::color_scheme() const {
   return ColorScheme::GetColorScheme(mode());
 }
 
 }  // namespace vr_shell