SV Test

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index cc76d1068097efec0d4d5068776e8af061cd296a..fb12e6513982475a43a80ac6a420fd0abaa8e269 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -23,6 +23,7 @@
 #include "ash/system/cast/tray_cast.h"
 #include "ash/system/date/tray_system_info.h"
 #include "ash/system/enterprise/tray_enterprise.h"
+#include "ash/system/fractional_view/tray_scale.h"
 #include "ash/system/ime/tray_ime_chromeos.h"
 #include "ash/system/media_security/multi_profile_media_tray_item.h"
 #include "ash/system/network/tray_network.h"
@@ -49,10 +50,12 @@
 #include "ash/wm/container_finder.h"
 #include "ash/wm/widget_finder.h"
 #include "ash/wm_window.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/timer.h"
+#include "chromeos/chromeos_switches.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
@@ -273,6 +276,12 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
   AddTrayItem(base::WrapUnique(tray_audio_));
   AddTrayItem(base::MakeUnique<TrayBrightness>(this));
   AddTrayItem(base::MakeUnique<TrayCapsLock>(this));
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kEnableScalableViews)) {
+    tray_scale_ = new TrayScale(this);
+    AddTrayItem(base::WrapUnique(tray_scale_));
+  }
+
   // TODO(jamescook): Remove this when mus has support for display management
   // and we have a DisplayManager equivalent. See http://crbug.com/548429
   std::unique_ptr<SystemTrayItem> tray_rotation_lock =