Updates to Ash material design icons used for TrayImageItem

Update the following icons used in the Ash material
design system menu:

* Caps lock
* Auto rotation
* Auto rotation locked
* System update available

Furthermore, color the system update icon in the
system tray and system menu in response to the
severity of the update. The colors chosen for
each severity level match those used by the
system update icon in material design top chrome.

BUG=625690
TEST=manual

Review-Url: https://codereview.chromium.org/2252823002
Cr-Commit-Position: refs/heads/master@{#412609}

ash/common/system/chromeos/tray_caps_lock.cc

@@ -48,8 +48,8 @@ class CapsLockDefaultView : public ActionableView {
     FixedSizedImageView* image =
         new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
     if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      image->SetImage(CreateVectorIcon(gfx::VectorIconId::SYSTEM_MENU_CAPS_LOCK,
-                                       kMenuIconSize, kMenuIconColor));
+      image->SetImage(gfx::CreateVectorIcon(
+          gfx::VectorIconId::SYSTEM_MENU_CAPS_LOCK, kMenuIconColor));
     } else {
       ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
       image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK)

ash/common/system/tray/default_system_tray_delegate.cc

@@ -39,7 +39,7 @@ bool DefaultSystemTrayDelegate::IsUserSupervised() const {
 
 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
   DCHECK(info);
-  info->severity = UpdateInfo::UPDATE_NORMAL;
+  info->severity = UpdateInfo::UPDATE_NONE;
   info->update_required = true;
   info->factory_reset_required = false;
 }

ash/common/system/tray/system_tray_delegate.cc

@@ -23,7 +23,7 @@ BluetoothDeviceInfo::BluetoothDeviceInfo()
 BluetoothDeviceInfo::~BluetoothDeviceInfo() {}
 
 UpdateInfo::UpdateInfo()
-    : severity(UPDATE_NORMAL),
+    : severity(UPDATE_NONE),
       update_required(false),
       factory_reset_required(false) {}
 
@@ -74,7 +74,7 @@ bool SystemTrayDelegate::IsUserChild() const {
 }
 
 void SystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
-  info->severity = UpdateInfo::UPDATE_NORMAL;
+  info->severity = UpdateInfo::UPDATE_NONE;
   info->update_required = false;
   info->factory_reset_required = false;
 }

ash/common/system/tray/system_tray_delegate.h

@@ -68,10 +68,12 @@ using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>;
 
 struct ASH_EXPORT UpdateInfo {
   enum UpdateSeverity {
-    UPDATE_NORMAL,
-    UPDATE_LOW_GREEN,
-    UPDATE_HIGH_ORANGE,
-    UPDATE_SEVERE_RED,
+    UPDATE_NONE,
+    UPDATE_LOW,
+    UPDATE_ELEVATED,
+    UPDATE_HIGH,
+    UPDATE_SEVERE,
+    UPDATE_CRITICAL,
   };
 
   UpdateInfo();

ash/common/system/tray/tray_image_item.cc

@@ -59,6 +59,7 @@ TrayImageItem::TrayImageItem(SystemTray* system_tray,
                              UmaType uma_type)
     : SystemTrayItem(system_tray, uma_type),
       resource_id_(resource_id),
+      icon_color_(kTrayIconColor),
       tray_view_(nullptr) {}
 
 TrayImageItem::~TrayImageItem() {}
@@ -71,16 +72,7 @@ views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
   CHECK(!tray_view_);
   tray_view_ = new TrayItemView(this);
   tray_view_->CreateImageView();
-
-  if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-    tray_view_->image_view()->SetImage(CreateVectorIcon(
-        ResourceIdToVectorIconId(resource_id_), kTrayIconSize, kTrayIconColor));
-  } else {
-    tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
-                                           .GetImageNamed(resource_id_)
-                                           .ToImageSkia());
-  }
-
+  UpdateImageOnImageView();
   tray_view_->SetVisible(GetInitialVisibility());
   SetItemAlignment(system_tray()->shelf_alignment());
   return tray_view_;
@@ -109,15 +101,14 @@ void TrayImageItem::DestroyDefaultView() {}
 
 void TrayImageItem::DestroyDetailedView() {}
 
-// TODO(tdanderson): Consider moving or renaming this function, as it is only
-// used by TrayUpdate to modify the update severity. See crbug.com/625692.
+void TrayImageItem::SetIconColor(SkColor color) {
+  icon_color_ = color;
+  UpdateImageOnImageView();
+}
+
 void TrayImageItem::SetImageFromResourceId(int resource_id) {
   resource_id_ = resource_id;
-  if (!tray_view_)
-    return;
-  tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
-                                         .GetImageNamed(resource_id_)
-                                         .ToImageSkia());
+  UpdateImageOnImageView();
 }
 
 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) {
@@ -129,4 +120,18 @@ void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) {
   tray_view_->Layout();
 }
 
+void TrayImageItem::UpdateImageOnImageView() {
+  if (!tray_view_)
+    return;
+
+  if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
+    tray_view_->image_view()->SetImage(gfx::CreateVectorIcon(
+        ResourceIdToVectorIconId(resource_id_), kTrayIconSize, icon_color_));
+  } else {
+    tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
+                                           .GetImageNamed(resource_id_)
+                                           .ToImageSkia());
+  }
+}
+
 }  // namespace ash

ash/common/system/tray/tray_image_item.h

@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "base/macros.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace views {
 class ImageView;
@@ -36,14 +37,29 @@ class ASH_EXPORT TrayImageItem : public SystemTrayItem {
   void UpdateAfterLoginStatusChange(LoginStatus status) override;
   void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
 
+  // Sets the color of the material design icon to |color|.
+  void SetIconColor(SkColor color);
+
   // Changes the icon of the tray-view to the specified resource.
+  // TODO(tdanderson): This is only used for non-material design, so remove it
+  // when material design is the default. See crbug.com/625692.
   void SetImageFromResourceId(int resource_id);
 
  private:
   // Set the alignment of the image depending on the shelf alignment.
   void SetItemAlignment(ShelfAlignment alignment);
 
+  // Sets the current icon on |tray_view_|'s ImageView.
+  void UpdateImageOnImageView();
+
+  // The resource ID for the non-material design icon in the tray.
+  // TODO(tdanderson): This is only used for non-material design, so remove it
+  // when material design is the default. See crbug.com/625692.
   int resource_id_;
+
+  // The color of the material design icon in the tray.
+  SkColor icon_color_;
+
   TrayItemView* tray_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayImageItem);

ash/common/system/update/tray_update.cc

@@ -4,6 +4,7 @@
 
 #include "ash/common/system/update/tray_update.h"
 
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray.h"
@@ -14,7 +15,10 @@
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ -22,22 +26,26 @@
 namespace ash {
 namespace {
 
-// TODO(tdanderson): The material design update icon needs to be colored
-// programmatically. See crbug.com/625692.
+// Decides the non-material design image resource to use for a given update
+// severity.
+// TODO(tdanderson): This is only used for non-material design, so remove it
+// when material design is the default. See crbug.com/625692.
 int DecideResource(UpdateInfo::UpdateSeverity severity, bool dark) {
   switch (severity) {
-    case UpdateInfo::UPDATE_NORMAL:
+    case UpdateInfo::UPDATE_NONE:
+    case UpdateInfo::UPDATE_LOW:
       return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK : IDR_AURA_UBER_TRAY_UPDATE;
 
-    case UpdateInfo::UPDATE_LOW_GREEN:
+    case UpdateInfo::UPDATE_ELEVATED:
       return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_GREEN
                   : IDR_AURA_UBER_TRAY_UPDATE_GREEN;
 
-    case UpdateInfo::UPDATE_HIGH_ORANGE:
+    case UpdateInfo::UPDATE_HIGH:
       return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_ORANGE
                   : IDR_AURA_UBER_TRAY_UPDATE_ORANGE;
 
-    case UpdateInfo::UPDATE_SEVERE_RED:
+    case UpdateInfo::UPDATE_SEVERE:
+    case UpdateInfo::UPDATE_CRITICAL:
       return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_RED
                   : IDR_AURA_UBER_TRAY_UPDATE_RED;
   }
@@ -46,6 +54,30 @@ int DecideResource(UpdateInfo::UpdateSeverity severity, bool dark) {
   return 0;
 }
 
+// Returns the color to use for the material design update icon when the update
+// severity is |severity|. If |for_menu| is true, the icon color for the system
+// menu is given, otherwise the icon color for the system tray is given.
+SkColor IconColorForUpdateSeverity(UpdateInfo::UpdateSeverity severity,
+                                   bool for_menu) {
+  const SkColor default_color = for_menu ? kMenuIconColor : kTrayIconColor;
+  switch (severity) {
+    case UpdateInfo::UPDATE_NONE:
+      return default_color;
+    case UpdateInfo::UPDATE_LOW:
+      return for_menu ? gfx::kGoogleGreen700 : gfx::kGoogleGreen300;
+    case UpdateInfo::UPDATE_ELEVATED:
+      return for_menu ? gfx::kGoogleYellow700 : gfx::kGoogleYellow300;
+    case UpdateInfo::UPDATE_HIGH:
+    case UpdateInfo::UPDATE_SEVERE:
+    case UpdateInfo::UPDATE_CRITICAL:
+      return for_menu ? gfx::kGoogleRed700 : gfx::kGoogleRed300;
+    default:
+      NOTREACHED();
+      break;
+  }
+  return default_color;
+}
+
 class UpdateView : public ActionableView {
  public:
   explicit UpdateView(const UpdateInfo& info) {
@@ -56,9 +88,14 @@ class UpdateView : public ActionableView {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     views::ImageView* image =
         new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
-    image->SetImage(bundle.GetImageNamed(DecideResource(info.severity, true))
-                        .ToImageSkia());
-
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      image->SetImage(gfx::CreateVectorIcon(
+          gfx::VectorIconId::SYSTEM_MENU_UPDATE,
+          IconColorForUpdateSeverity(info.severity, true)));
+    } else {
+      image->SetImage(bundle.GetImageNamed(DecideResource(info.severity, true))
+                          .ToImageSkia());
+    }
     AddChildView(image);
 
     base::string16 label =
@@ -108,7 +145,10 @@ views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
 }
 
 void TrayUpdate::OnUpdateRecommended(const UpdateInfo& info) {
-  SetImageFromResourceId(DecideResource(info.severity, false));
+  if (MaterialDesignController::UseMaterialDesignSystemIcons())
+    SetIconColor(IconColorForUpdateSeverity(info.severity, false));
+  else
+    SetImageFromResourceId(DecideResource(info.severity, false));
   tray_view()->SetVisible(true);
 }
 

ash/test/test_system_tray_delegate.cc

@@ -91,7 +91,7 @@ bool TestSystemTrayDelegate::IsUserSupervised() const {
 
 void TestSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
   DCHECK(info);
-  info->severity = UpdateInfo::UPDATE_NORMAL;
+  info->severity = UpdateInfo::UPDATE_NONE;
   info->update_required = g_system_update_required;
   info->factory_reset_required = false;
 }

chrome/browser/ui/ash/system_tray_delegate_utils.cc

@@ -13,18 +13,22 @@ void GetUpdateInfo(const UpgradeDetector* detector, ash::UpdateInfo* info) {
   DCHECK(info);
   switch (detector->upgrade_notification_stage()) {
     case UpgradeDetector::UPGRADE_ANNOYANCE_CRITICAL:
+      info->severity = ash::UpdateInfo::UPDATE_CRITICAL;
+      break;
     case UpgradeDetector::UPGRADE_ANNOYANCE_SEVERE:
-      info->severity = ash::UpdateInfo::UPDATE_SEVERE_RED;
+      info->severity = ash::UpdateInfo::UPDATE_SEVERE;
       break;
     case UpgradeDetector::UPGRADE_ANNOYANCE_HIGH:
-      info->severity = ash::UpdateInfo::UPDATE_HIGH_ORANGE;
+      info->severity = ash::UpdateInfo::UPDATE_HIGH;
       break;
     case UpgradeDetector::UPGRADE_ANNOYANCE_ELEVATED:
-      info->severity = ash::UpdateInfo::UPDATE_LOW_GREEN;
+      info->severity = ash::UpdateInfo::UPDATE_ELEVATED;
       break;
     case UpgradeDetector::UPGRADE_ANNOYANCE_LOW:
+      info->severity = ash::UpdateInfo::UPDATE_LOW;
+      break;
     case UpgradeDetector::UPGRADE_ANNOYANCE_NONE:
-      info->severity = ash::UpdateInfo::UPDATE_NORMAL;
+      info->severity = ash::UpdateInfo::UPDATE_NONE;
       break;
   }
   info->update_required = detector->notify_upgrade();

ui/gfx/vector_icons/system_menu_caps_lock.1x.icon

+// Copyright 2016 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 2, 3.99f,
+CUBIC_TO, 2, 2.89f, 2.9f, 2, 3.99f, 2,
+R_H_LINE_TO, 12.01f,
+CUBIC_TO, 17.11f, 2, 18, 2.9f, 18, 3.99f,
+R_V_LINE_TO, 12.01f,
+ARC_TO, 2, 2, 0, 0, 1, 16.01f, 18,
+H_LINE_TO, 3.99f,
+ARC_TO, 2, 2, 0, 0, 1, 2, 16.01f,
+V_LINE_TO, 3.99f,
+CLOSE,
+R_MOVE_TO, 8, 2.67f,
+LINE_TO, 13.83f, 11,
+LINE_TO, 15, 9.67f,
+LINE_TO, 10, 4,
+LINE_TO, 5, 9.67f,
+LINE_TO, 6.18f, 11,
+LINE_TO, 10, 6.66f,
+CLOSE,
+MOVE_TO, 5, 15,
+R_H_LINE_TO, 10,
+R_V_LINE_TO, -2,
+H_LINE_TO, 5,
+R_V_LINE_TO, 2,
+CLOSE,
+END

ui/gfx/vector_icons/system_menu_caps_lock.icon

@@ -2,19 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-CANVAS_DIMENSIONS, 24,
-MOVE_TO, 12, 8.41f,
-LINE_TO, 16.59f, 13,
-LINE_TO, 18, 11.59f,
-R_LINE_TO, -6, -6,
-R_LINE_TO, -6, 6,
-LINE_TO, 7.41f, 13,
-LINE_TO, 12, 8.41f,
+CANVAS_DIMENSIONS, 40,
+MOVE_TO, 5, 9,
+R_CUBIC_TO, 0, -2.21f, 1.79f, -4, 4, -4,
+R_H_LINE_TO, 22,
+R_CUBIC_TO, 2.21f, 0, 4, 1.79f, 4, 4,
+R_V_LINE_TO, 22,
+R_CUBIC_TO, 0, 2.21f, -1.79f, 4, -4, 4,
+H_LINE_TO, 9,
+R_CUBIC_TO, -2.21f, 0, -4, -1.79f, -4, -4,
+V_LINE_TO, 9,
 CLOSE,
-MOVE_TO, 6, 18,
-R_H_LINE_TO, 12,
-R_V_LINE_TO, -2,
-H_LINE_TO, 6,
-R_V_LINE_TO, 2,
+R_MOVE_TO, 15, 5.95f,
+LINE_TO, 27.65f, 23,
+LINE_TO, 30, 20.53f,
+LINE_TO, 20, 10,
+LINE_TO, 10, 20.53f,
+LINE_TO, 12.35f, 23,
+LINE_TO, 20, 14.95f,
+CLOSE,
+MOVE_TO, 10, 30,
+R_H_LINE_TO, 20,
+R_V_LINE_TO, -3,
+H_LINE_TO, 10,
+R_V_LINE_TO, 3,
 CLOSE,
 END

ui/gfx/vector_icons/system_menu_rotation_lock_auto.1x.icon

+// Copyright 2016 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 13, 3.68f,
+R_CUBIC_TO, 2.19f, 1.03f, 3.76f, 3.15f, 4, 5.65f,
+H_LINE_TO, 18,
+CUBIC_TO, 17.66f, 5.23f, 14.21f, 2, 10, 2,
+R_LINE_TO, -0.44f, 0.02f,
+R_LINE_TO, 2.55f, 2.54f,
+R_LINE_TO, 0.89f, -0.88f,
+CLOSE,
+R_MOVE_TO, -4.18f, -0.51f,
+R_ARC_TO, 1, 1, 0, 0, 0, -1.42f, 0,
+R_LINE_TO, -4.26f, 4.24f,
+R_ARC_TO, 0.99f, 0.99f, 0, 0, 0, 0, 1.41f,
+R_LINE_TO, 8.05f, 8.01f,
+R_ARC_TO, 1, 1, 0, 0, 0, 1.42f, 0,
+R_LINE_TO, 4.26f, -4.24f,
+R_ARC_TO, 0.99f, 0.99f, 0, 0, 0, 0, -1.41f,
+LINE_TO, 8.82f, 3.17f,
+CLOSE,
+R_MOVE_TO, 2.9f, 12.39f,
+LINE_TO, 4.42f, 8.29f,
+R_LINE_TO, 3.86f, -3.84f,
+R_LINE_TO, 7.29f, 7.26f,
+R_LINE_TO, -3.86f, 3.84f,
+CLOSE,
+R_MOVE_TO, -4.72f, 0.77f,
+R_ARC_TO, 6.99f, 6.99f, 0, 0, 1, -4, -5.65f,
+H_LINE_TO, 2,
+CUBIC_TO, 2.34f, 14.77f, 5.79f, 18, 10, 18,
+R_LINE_TO, 0.44f, -0.02f,
+R_LINE_TO, -2.55f, -2.54f,
+R_LINE_TO, -0.89f, 0.88f,
+CLOSE,
+END

ui/gfx/vector_icons/system_menu_rotation_lock_auto.icon

@@ -2,37 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-CANVAS_DIMENSIONS, 24,
-MOVE_TO, 16.48f, 2.52f,
-R_CUBIC_TO, 3.27f, 1.55f, 5.61f, 4.72f, 5.97f, 8.48f,
-R_H_LINE_TO, 1.5f,
-CUBIC_TO, 23.44f, 4.84f, 18.29f, 0, 12, 0,
-R_LINE_TO, -0.66f, 0.03f,
-R_LINE_TO, 3.81f, 3.81f,
-R_LINE_TO, 1.33f, -1.32f,
+CANVAS_DIMENSIONS, 40,
+MOVE_TO, 26, 7.36f,
+R_CUBIC_TO, 4.38f, 2.07f, 7.51f, 6.29f, 7.99f, 11.31f,
+H_LINE_TO, 36,
+CUBIC_TO, 35.32f, 10.45f, 28.42f, 4, 20, 4,
+R_LINE_TO, -0.88f, 0.04f,
+R_LINE_TO, 5.1f, 5.08f,
+R_LINE_TO, 1.78f, -1.76f,
 CLOSE,
-R_MOVE_TO, -6.25f, -0.77f,
-R_CUBIC_TO, -0.59f, -0.59f, -1.54f, -0.59f, -2.12f, 0,
-LINE_TO, 1.75f, 8.11f,
-R_CUBIC_TO, -0.59f, 0.59f, -0.59f, 1.54f, 0, 2.12f,
-R_LINE_TO, 12.02f, 12.02f,
-R_CUBIC_TO, 0.59f, 0.59f, 1.54f, 0.59f, 2.12f, 0,
-R_LINE_TO, 6.36f, -6.36f,
-R_CUBIC_TO, 0.59f, -0.59f, 0.59f, -1.54f, 0, -2.12f,
-LINE_TO, 10.23f, 1.75f,
+MOVE_TO, 17.63f, 6.33f,
+R_ARC_TO, 2, 2, 0, 0, 0, -2.84f, 0,
+R_LINE_TO, -8.52f, 8.48f,
+R_ARC_TO, 1.98f, 1.98f, 0, 0, 0, 0, 2.83f,
+LINE_TO, 22.37f, 33.67f,
+R_CUBIC_TO, 0.79f, 0.79f, 2.06f, 0.79f, 2.84f, 0,
+R_LINE_TO, 8.52f, -8.48f,
+R_CUBIC_TO, 0.79f, -0.79f, 0.79f, -2.05f, 0, -2.83f,
+LINE_TO, 17.63f, 6.33f,
 CLOSE,
-R_MOVE_TO, 4.6f, 19.44f,
-LINE_TO, 2.81f, 9.17f,
-R_LINE_TO, 6.36f, -6.36f,
-R_LINE_TO, 12.02f, 12.02f,
-R_LINE_TO, -6.36f, 6.36f,
+R_MOVE_TO, 5.94f, 25.2f,
+LINE_TO, 8.42f, 16.45f,
+R_LINE_TO, 8.01f, -7.98f,
+LINE_TO, 31.58f, 23.55f,
+R_LINE_TO, -8.01f, 7.98f,
 CLOSE,
-R_MOVE_TO, -7.31f, 0.29f,
-CUBIC_TO, 4.25f, 19.94f, 1.91f, 16.76f, 1.55f, 13,
-H_LINE_TO, 0.05f,
-CUBIC_TO, 0.56f, 19.16f, 5.71f, 24, 12, 24,
-R_LINE_TO, 0.66f, -0.03f,
-R_LINE_TO, -3.81f, -3.81f,
-R_LINE_TO, -1.33f, 1.32f,
+R_MOVE_TO, -9.56f, 1.11f,
+R_CUBIC_TO, -4.38f, -2.05f, -7.51f, -6.29f, -7.99f, -11.31f,
+H_LINE_TO, 4,
+CUBIC_TO, 4.68f, 29.55f, 11.58f, 36, 20, 36,
+R_LINE_TO, 0.88f, -0.04f,
+R_LINE_TO, -5.1f, -5.08f,
+R_LINE_TO, -1.78f, 1.76f,
 CLOSE,
 END

ui/gfx/vector_icons/system_menu_rotation_lock_locked.1x.icon

+// Copyright 2016 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 15.44f, 9.26f,
+R_LINE_TO, -0.96f, 0.96f,
+R_LINE_TO, 1.52f, 1.52f,
+R_LINE_TO, -3.87f, 3.87f,
+LINE_TO, 4.4f, 7.87f,
+R_LINE_TO, 3.87f, -3.87f,
+LINE_TO, 9.7f, 5.44f,
+R_LINE_TO, 0.96f, -0.96f,
+R_LINE_TO, -1.67f, -1.67f,
+R_ARC_TO, 1.02f, 1.02f, 0, 0, 0, -1.45f, 0,
+LINE_TO, 3.2f, 7.15f,
+R_ARC_TO, 1.02f, 1.02f, 0, 0, 0, 0, 1.45f,
+R_LINE_TO, 8.21f, 8.21f,
+R_ARC_TO, 1.02f, 1.02f, 0, 0, 0, 1.45f, 0,
+R_LINE_TO, 4.34f, -4.34f,
+R_ARC_TO, 1.02f, 1.02f, 0, 0, 0, 0, -1.45f,
+R_LINE_TO, -1.76f, -1.75f,
+CLOSE,
+R_MOVE_TO, -8.34f, 7.02f,
+R_ARC_TO, 7.16f, 7.16f, 0, 0, 1, -4.08f, -5.79f,
+H_LINE_TO, 2,
+CUBIC_TO, 2.35f, 14.69f, 5.87f, 18, 10.16f, 18,
+R_LINE_TO, 0.45f, -0.02f,
+R_LINE_TO, -2.6f, -2.61f,
+R_LINE_TO, -0.91f, 0.91f,
+CLOSE,
+MOVE_TO, 15.33f, 8,
+CUBIC_TO, 15.8f, 8, 16, 7.79f, 16, 7.38f,
+V_LINE_TO, 5.29f,
+R_CUBIC_TO, 0, -0.42f, -0.37f, -0.62f, -0.67f, -0.62f,
+R_V_LINE_TO, -0.28f,
+CUBIC_TO, 15.33f, 3.62f, 14.74f, 3, 14, 3,
+R_CUBIC_TO, -0.74f, 0, -1.33f, 0.62f, -1.33f, 1.39f,
+R_V_LINE_TO, 0.28f,
+R_CUBIC_TO, -0.29f, 0, -0.67f, 0.21f, -0.67f, 0.63f,
+R_V_LINE_TO, 2.08f,
+R_CUBIC_TO, 0, 0.42f, 0.2f, 0.63f, 0.67f, 0.63f,
+R_H_LINE_TO, 2.67f,
+CLOSE,
+MOVE_TO, 13.2f, 4.8f,
+R_CUBIC_TO, 0, -0.33f, 0.41f, -0.8f, 0.8f, -0.8f,
+R_CUBIC_TO, 0.39f, 0, 0.8f, 0.47f, 0.8f, 0.8f,
+V_LINE_TO, 5,
+R_H_LINE_TO, -1.6f,
+R_V_LINE_TO, -0.2f,
+CLOSE,
+END

ui/gfx/vector_icons/system_menu_rotation_lock_locked.icon

@@ -2,51 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-CANVAS_DIMENSIONS, 24,
-MOVE_TO, 23.25f, 12.77f,
-R_LINE_TO, -2.57f, -2.57f,
-R_LINE_TO, -1.41f, 1.41f,
-R_LINE_TO, 2.22f, 2.22f,
-R_LINE_TO, -5.66f, 5.66f,
-LINE_TO, 4.51f, 8.17f,
-R_LINE_TO, 5.66f, -5.66f,
-R_LINE_TO, 2.1f, 2.1f,
-R_LINE_TO, 1.41f, -1.41f,
-LINE_TO, 11.23f, 0.75f,
-R_CUBIC_TO, -0.59f, -0.59f, -1.54f, -0.59f, -2.12f, 0,
-LINE_TO, 2.75f, 7.11f,
-R_CUBIC_TO, -0.59f, 0.59f, -0.59f, 1.54f, 0, 2.12f,
-R_LINE_TO, 12.02f, 12.02f,
-R_CUBIC_TO, 0.59f, 0.59f, 1.54f, 0.59f, 2.12f, 0,
-R_LINE_TO, 6.36f, -6.36f,
-R_CUBIC_TO, 0.59f, -0.59f, 0.59f, -1.54f, 0, -2.12f,
+CANVAS_DIMENSIONS, 40,
+MOVE_TO, 30.89f, 18.51f,
+R_LINE_TO, -1.93f, 1.93f,
+R_LINE_TO, 3.03f, 3.03f,
+R_LINE_TO, -7.73f, 7.73f,
+LINE_TO, 8.8f, 15.74f,
+R_LINE_TO, 7.73f, -7.73f,
+R_LINE_TO, 2.87f, 2.87f,
+R_LINE_TO, 1.93f, -1.93f,
+R_LINE_TO, -3.35f, -3.35f,
+R_ARC_TO, 2.04f, 2.04f, 0, 0, 0, -2.9f, 0,
+R_LINE_TO, -8.69f, 8.69f,
+R_ARC_TO, 2.04f, 2.04f, 0, 0, 0, 0, 2.9f,
+R_LINE_TO, 16.42f, 16.42f,
+R_ARC_TO, 2.04f, 2.04f, 0, 0, 0, 2.9f, 0,
+R_LINE_TO, 8.69f, -8.69f,
+R_ARC_TO, 2.04f, 2.04f, 0, 0, 0, 0, -2.9f,
+R_LINE_TO, -3.51f, -3.51f,
 CLOSE,
-MOVE_TO, 8.47f, 20.48f,
-CUBIC_TO, 5.2f, 18.94f, 2.86f, 15.76f, 2.5f, 12,
-H_LINE_TO, 1,
-R_CUBIC_TO, 0.51f, 6.16f, 5.66f, 11, 11.95f, 11,
-R_LINE_TO, 0.66f, -0.03f,
-R_LINE_TO, -3.81f, -3.82f,
-R_LINE_TO, -1.33f, 1.33f,
+R_MOVE_TO, -16.68f, 14.04f,
+R_ARC_TO, 14.33f, 14.33f, 0, 0, 1, -8.16f, -11.58f,
+H_LINE_TO, 4,
+CUBIC_TO, 4.7f, 29.39f, 11.73f, 36, 20.33f, 36,
+R_LINE_TO, 0.9f, -0.04f,
+R_LINE_TO, -5.2f, -5.22f,
+R_LINE_TO, -1.82f, 1.82f,
 CLOSE,
-MOVE_TO, 16, 9,
-R_H_LINE_TO, 5,
-R_CUBIC_TO, 0.55f, 0, 1, -0.45f, 1, -1,
-V_LINE_TO, 4,
-R_CUBIC_TO, 0, -0.55f, -0.45f, -1, -1, -1,
-R_V_LINE_TO, -0.5f,
-CUBIC_TO, 21, 1.12f, 19.88f, 0, 18.5f, 0,
-CUBIC_TO, 17.12f, 0, 16, 1.12f, 16, 2.5f,
-V_LINE_TO, 3,
-R_CUBIC_TO, -0.55f, 0, -1, 0.45f, -1, 1,
-R_V_LINE_TO, 4,
-R_CUBIC_TO, 0, 0.55f, 0.45f, 1, 1, 1,
+MOVE_TO, 31.33f, 17,
+CUBIC_TO, 32.5f, 17, 33, 16.5f, 33, 15.5f,
+R_V_LINE_TO, -5,
+R_CUBIC_TO, 0, -1, -0.93f, -1.5f, -1.67f, -1.5f,
+R_V_LINE_TO, -0.67f,
+R_ARC_TO, 3.34f, 3.34f, 0, 0, 0, -6.67f, 0,
+V_LINE_TO, 9,
+CUBIC_TO, 23.93f, 9, 23, 9.5f, 23, 10.5f,
+R_V_LINE_TO, 5,
+R_CUBIC_TO, 0, 1, 0.5f, 1.5f, 1.67f, 1.5f,
+R_H_LINE_TO, 6.67f,
 CLOSE,
-R_MOVE_TO, 0.8f, -6.5f,
-R_CUBIC_TO, 0, -0.94f, 0.76f, -1.7f, 1.7f, -1.7f,
-R_CUBIC_TO, 0.94f, 0, 1.7f, 0.76f, 1.7f, 1.7f,
-V_LINE_TO, 3,
-R_H_LINE_TO, -3.4f,
-R_V_LINE_TO, -0.5f,
+MOVE_TO, 26, 8.49f,
+R_CUBIC_TO, 0, -0.83f, 1.02f, -1.99f, 2, -1.99f,
+R_CUBIC_TO, 0.98f, 0, 2, 1.17f, 2, 1.99f,
+V_LINE_TO, 9,
+R_H_LINE_TO, -4,
+R_V_LINE_TO, -0.51f,
 CLOSE,
 END

ui/gfx/vector_icons/system_menu_update.1x.icon

+// Copyright 2016 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 10, 18,
+R_ARC_TO, 8, 8, 0, 1, 0, 0, -16,
+R_ARC_TO, 8, 8, 0, 0, 0, 0, 16,
+CLOSE,
+R_MOVE_TO, -1, -5,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, -2,
+R_H_LINE_TO, 2,
+R_LINE_TO, -3, -4,
+R_LINE_TO, -3, 4,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 2,
+CLOSE,
+END

ui/gfx/vector_icons/system_menu_update.icon

+// Copyright 2016 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.
+
+CANVAS_DIMENSIONS, 40,
+MOVE_TO, 20, 36,
+R_CUBIC_TO, 8.84f, 0, 16, -7.16f, 16, -16,
+CUBIC_TO, 36, 11.16f, 28.84f, 4, 20, 4,
+CUBIC_TO, 11.16f, 4, 4, 11.16f, 4, 20,
+R_CUBIC_TO, 0, 8.84f, 7.16f, 16, 16, 16,
+CLOSE,
+R_MOVE_TO, -3, -9,
+R_H_LINE_TO, 6,
+R_V_LINE_TO, -6,
+R_H_LINE_TO, 4,
+R_LINE_TO, -7, -8,
+R_LINE_TO, -7, 8,
+R_H_LINE_TO, 4,
+R_V_LINE_TO, 6,
+CLOSE,
+END

ui/gfx/vector_icons_sources.gypi

@@ -147,6 +147,7 @@
       'vector_icons/system_menu_brightness.icon',
       'vector_icons/system_menu_business.1x.icon',
       'vector_icons/system_menu_business.icon',
+      'vector_icons/system_menu_caps_lock.1x.icon',
       'vector_icons/system_menu_caps_lock.icon',
       'vector_icons/system_menu_cast.1x.icon',
       'vector_icons/system_menu_cast.icon',
@@ -154,7 +155,9 @@
       'vector_icons/system_menu_child_user.icon',
       'vector_icons/system_menu_keyboard.1x.icon',
       'vector_icons/system_menu_keyboard.icon',
+      'vector_icons/system_menu_rotation_lock_auto.1x.icon',
       'vector_icons/system_menu_rotation_lock_auto.icon',
+      'vector_icons/system_menu_rotation_lock_locked.1x.icon',
       'vector_icons/system_menu_rotation_lock_locked.icon',
       'vector_icons/system_menu_screen_share.1x.icon',
       'vector_icons/system_menu_screen_share.icon',
@@ -163,6 +166,8 @@
       'vector_icons/system_menu_sms.icon',
       'vector_icons/system_menu_timer.1x.icon',
       'vector_icons/system_menu_timer.icon',
+      'vector_icons/system_menu_update.1x.icon',
+      'vector_icons/system_menu_update.icon',
       'vector_icons/system_tray_accessibility.1x.icon',
       'vector_icons/system_tray_accessibility.icon',
       'vector_icons/system_tray_battery.1x.icon',