Fix laser pointer icon for light mode

Bug: 1156228
Change-Id: Ibdb45ebbd6b54d3316e16844e75ebf4a12560757
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2597739Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#838210}

ash/resources/vector_icons/BUILD.gn

@@ -133,12 +133,14 @@ aggregate_vector_icons("ash_vector_icons") {
     "palette_action_capture_screen.icon",
     "palette_action_create_note.icon",
     "palette_mode_laser_pointer.icon",
+    "palette_mode_laser_pointer_light_mode.icon",
     "palette_mode_magnify.icon",
     "palette_mode_metalayer.icon",
     "palette_tray_icon_capture_region.icon",
     "palette_tray_icon_default.icon",
     "palette_tray_icon_default_newui.icon",
     "palette_tray_icon_laser_pointer.icon",
+    "palette_tray_icon_laser_pointer_light_mode.icon",
     "palette_tray_icon_magnify.icon",
     "palette_tray_icon_metalayer.icon",
     "phone_hub_battery_saver.icon",

ash/resources/vector_icons/palette_mode_laser_pointer_light_mode.icon

+// Copyright 2020 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,
+PATH_COLOR_ARGB, 0x4D, 0x00, 0x00, 0x00,
+MOVE_TO, 30.06f, 15,
+R_H_LINE_TO, -9.59f,
+R_LINE_TO, 9.6f, -9.27f,
+R_CUBIC_TO, 0.6f, -0.48f, 1, -1.24f, 1, -2.11f,
+CUBIC_TO, 31.07f, 2.17f, 29.96f, 1, 28.6f, 1,
+R_CUBIC_TO, -0.51f, 0, -0.98f, 0.16f, -1.37f, 0.44f,
+LINE_TO, 8.09f, 15.03f,
+R_CUBIC_TO, -0.23f, 0.13f, -0.44f, 0.28f, -0.64f, 0.46f,
+R_LINE_TO, -0.07f, 0.05f,
+CUBIC_TO, 6.54f, 16.31f, 6, 17.43f, 6, 18.69f,
+R_CUBIC_TO, 0, 2.31f, 1.76f, 4.18f, 3.93f, 4.31f,
+R_H_LINE_TO, 6.22f,
+R_LINE_TO, -7.54f, 4.83f,
+R_CUBIC_TO, 0.84f, -0.54f, 1.81f, -0.86f, 2.86f, -0.86f,
+R_CUBIC_TO, 3.07f, 0, 5.55f, 2.64f, 5.55f, 5.9f,
+R_CUBIC_TO, 0, 1.61f, -0.61f, 3.07f, -1.6f, 4.13f,
+R_LINE_TO, 16.68f, -14.75f,
+R_CUBIC_TO, 0.32f, -0.21f, 0.61f, -0.46f, 0.86f, -0.76f,
+R_CUBIC_TO, 0.65f, -0.81f, 1.03f, -1.75f, 1.03f, -2.79f,
+R_CUBIC_TO, 0, -2.31f, -1.76f, -3.67f, -3.94f, -3.69f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 18, 32.57f,
+R_CUBIC_TO, 0, -3.31f, -2.69f, -6, -6, -6,
+R_CUBIC_TO, -1.13f, 0, -2.18f, 0.33f, -3.09f, 0.88f,
+R_LINE_TO, -0.36f, 0.23f,
+R_CUBIC_TO, -0.03f, 0.02f, -0.05f, 0.05f, -0.08f, 0.07f,
+CUBIC_TO, 6.98f, 28.83f, 6, 30.58f, 6, 32.56f,
+R_CUBIC_TO, 0, 3.31f, 2.69f, 6, 6, 6,
+R_CUBIC_TO, 1.24f, 0, 2.39f, -0.38f, 3.34f, -1.03f,
+R_LINE_TO, 0, 0,
+R_LINE_TO, 0.02f, -0.01f,
+R_CUBIC_TO, 0.33f, -0.22f, 0.63f, -0.48f, 0.91f, -0.76f,
+CUBIC_TO, 17.34f, 35.69f, 18, 34.21f, 18, 32.57f,
+CLOSE
+
+CANVAS_DIMENSIONS, 20,
+PATH_COLOR_ARGB, 0x4D, 0x00, 0x00, 0x00,
+MOVE_TO, 14.96f, 8.04f,
+R_H_LINE_TO, -4.56f,
+R_LINE_TO, 4.56f, -4.8f,
+R_CUBIC_TO, 0.3f, -0.23f, 0.5f, -0.59f, 0.5f, -0.99f,
+R_CUBIC_TO, 0, -0.68f, -0.55f, -1.24f, -1.22f, -1.24f,
+R_CUBIC_TO, -0.25f, 0, -0.48f, 0.08f, -0.68f, 0.21f,
+R_CUBIC_TO, 0, 0, -9.48f, 6.42f, -9.48f, 6.42f,
+R_LINE_TO, -0.36f, 0.24f,
+R_CUBIC_TO, -0.41f, 0.37f, -0.7f, 0.16f, -0.7f, 1.41f,
+R_CUBIC_TO, 0, 0.56f, 0.92f, 1.69f, 2, 1.69f,
+H_LINE_TO, 9.03f,
+R_LINE_TO, -1.18f, 0.69f,
+R_CUBIC_TO, -1.17f, 0.68f, -3.52f, 2.04f, -3.52f, 2.04f,
+R_CUBIC_TO, 0.42f, -0.25f, 0.9f, -0.41f, 1.42f, -0.41f,
+R_CUBIC_TO, 1.52f, 0, 2.75f, 1.25f, 2.75f, 2.79f,
+R_CUBIC_TO, 0, 0.76f, -0.3f, 1.45f, -0.79f, 1.96f,
+R_LINE_TO, 8.26f, -6.98f,
+R_CUBIC_TO, 0.16f, -0.1f, 0.3f, -0.22f, 0.43f, -0.36f,
+R_CUBIC_TO, 0.25f, -0.29f, 0.47f, -0.54f, 0.56f, -0.86f,
+R_CUBIC_TO, 0.03f, -0.1f, 0.04f, -0.2f, 0.04f, -0.32f,
+R_CUBIC_TO, 0, -1.31f, -0.96f, -1.48f, -2.04f, -1.48f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 9, 16,
+R_CUBIC_TO, 0, -1.66f, -1.34f, -3, -3, -3,
+R_CUBIC_TO, -0.57f, 0, -1.09f, 0.17f, -1.54f, 0.44f,
+R_LINE_TO, -0.18f, 0.11f,
+R_CUBIC_TO, -0.01f, 0.01f, -0.03f, 0.02f, -0.04f, 0.03f,
+CUBIC_TO, 3.49f, 14.13f, 3, 15.01f, 3, 16,
+R_CUBIC_TO, 0, 1.66f, 1.34f, 3, 3, 3,
+R_CUBIC_TO, 0.62f, 0, 1.19f, -0.19f, 1.67f, -0.51f,
+R_H_LINE_TO, 0,
+R_LINE_TO, 0.01f, -0.01f,
+R_CUBIC_TO, 0.16f, -0.11f, 0.32f, -0.24f, 0.45f, -0.38f,
+CUBIC_TO, 8.67f, 17.56f, 9, 16.82f, 9, 16,
+CLOSE

ash/resources/vector_icons/palette_tray_icon_laser_pointer_light_mode.icon

+// Copyright 2020 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, 32,
+NEW_PATH,
+PATH_COLOR_ARGB, 0x4D, 0x00, 0x00, 0x00,
+MOVE_TO, 24.05f, 12,
+H_LINE_TO, 16.38f,
+R_LINE_TO, 7.68f, -7.42f,
+R_CUBIC_TO, 0.48f, -0.38f, 0.8f, -0.99f, 0.8f, -1.68f,
+CUBIC_TO, 24.86f, 1.74f, 23.97f, 0.8f, 22.88f, 0.8f,
+R_CUBIC_TO, -0.4f, 0, -0.78f, 0.13f, -1.1f, 0.35f,
+LINE_TO, 6.47f, 12.02f,
+R_CUBIC_TO, -0.18f, 0.1f, -0.36f, 0.23f, -0.51f, 0.37f,
+R_LINE_TO, -0.06f, 0.04f,
+R_CUBIC_TO, -0.67f, 0.62f, -1.1f, 1.52f, -1.1f, 2.53f,
+R_CUBIC_TO, 0, 1.85f, 1.41f, 3.34f, 3.15f, 3.44f,
+R_H_LINE_TO, 4.98f,
+R_LINE_TO, -6.03f, 3.87f,
+R_CUBIC_TO, 0.67f, -0.43f, 1.45f, -0.69f, 2.29f, -0.69f,
+R_CUBIC_TO, 2.46f, 0, 4.44f, 2.11f, 4.44f, 4.72f,
+R_CUBIC_TO, 0, 1.29f, -0.49f, 2.45f, -1.28f, 3.31f,
+R_LINE_TO, 13.35f, -11.8f,
+R_CUBIC_TO, 0.26f, -0.17f, 0.49f, -0.37f, 0.69f, -0.61f,
+R_CUBIC_TO, 0.52f, -0.64f, 0.82f, -1.4f, 0.82f, -2.23f,
+R_CUBIC_TO, 0, -1.84f, -1.41f, -2.94f, -3.15f, -2.96f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 14.4f, 26.05f,
+R_CUBIC_TO, 0, -2.65f, -2.15f, -4.8f, -4.8f, -4.8f,
+R_CUBIC_TO, -0.91f, 0, -1.75f, 0.27f, -2.47f, 0.71f,
+R_LINE_TO, -0.29f, 0.18f,
+R_CUBIC_TO, -0.02f, 0.02f, -0.04f, 0.04f, -0.07f, 0.05f,
+R_CUBIC_TO, -1.19f, 0.88f, -1.97f, 2.27f, -1.97f, 3.86f,
+R_CUBIC_TO, 0, 2.65f, 2.15f, 4.8f, 4.8f, 4.8f,
+R_CUBIC_TO, 0.99f, 0, 1.91f, -0.3f, 2.67f, -0.82f,
+R_LINE_TO, 0.02f, -0.01f,
+R_CUBIC_TO, 0.26f, -0.18f, 0.51f, -0.38f, 0.73f, -0.61f,
+R_CUBIC_TO, 0.85f, -0.87f, 1.38f, -2.05f, 1.38f, -3.36f,
+CLOSE
+
+CANVAS_DIMENSIONS, 16,
+NEW_PATH,
+PATH_COLOR_ARGB, 0x4D, 0x00, 0x00, 0x00,
+MOVE_TO, 12.03f, 6,
+H_LINE_TO, 8.19f,
+R_LINE_TO, 3.84f, -3.71f,
+R_CUBIC_TO, 0.24f, -0.19f, 0.4f, -0.5f, 0.4f, -0.84f,
+CUBIC_TO, 12.43f, 0.87f, 11.99f, 0.4f, 11.44f, 0.4f,
+R_CUBIC_TO, -0.2f, 0, -0.39f, 0.07f, -0.55f, 0.18f,
+LINE_TO, 3.24f, 6.01f,
+R_CUBIC_TO, -0.09f, 0.05f, -0.18f, 0.11f, -0.26f, 0.18f,
+R_LINE_TO, -0.03f, 0.02f,
+R_CUBIC_TO, -0.33f, 0.31f, -0.55f, 0.76f, -0.55f, 1.26f,
+R_CUBIC_TO, 0, 0.92f, 0.7f, 1.67f, 1.57f, 1.72f,
+R_H_LINE_TO, 2.49f,
+R_LINE_TO, -3.02f, 1.93f,
+R_CUBIC_TO, 0.34f, -0.21f, 0.72f, -0.35f, 1.14f, -0.35f,
+R_CUBIC_TO, 1.23f, 0, 2.22f, 1.06f, 2.22f, 2.36f,
+R_CUBIC_TO, 0, 0.64f, -0.24f, 1.23f, -0.64f, 1.65f,
+R_LINE_TO, 6.68f, -5.9f,
+R_CUBIC_TO, 0.13f, -0.08f, 0.24f, -0.18f, 0.34f, -0.3f,
+R_CUBIC_TO, 0.26f, -0.32f, 0.41f, -0.7f, 0.41f, -1.12f,
+R_CUBIC_TO, 0, -0.92f, -0.71f, -1.47f, -1.57f, -1.48f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 7.2f, 13.03f,
+R_CUBIC_TO, 0, -1.33f, -1.07f, -2.4f, -2.4f, -2.4f,
+R_CUBIC_TO, -0.45f, 0, -0.87f, 0.13f, -1.24f, 0.35f,
+R_LINE_TO, -0.15f, 0.09f,
+R_CUBIC_TO, -0.01f, 0.01f, -0.02f, 0.02f, -0.03f, 0.03f,
+R_CUBIC_TO, -0.59f, 0.44f, -0.98f, 1.14f, -0.98f, 1.93f,
+R_CUBIC_TO, 0, 1.33f, 1.08f, 2.4f, 2.4f, 2.4f,
+R_CUBIC_TO, 0.5f, 0, 0.96f, -0.15f, 1.34f, -0.41f,
+R_LINE_TO, 0.01f, 0,
+R_CUBIC_TO, 0.13f, -0.09f, 0.25f, -0.19f, 0.36f, -0.3f,
+R_CUBIC_TO, 0.43f, -0.43f, 0.69f, -1.02f, 0.69f, -1.68f,
+CLOSE

ash/system/palette/tools/laser_pointer_mode.cc

@@ -8,6 +8,7 @@
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/system/palette/palette_ids.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -41,11 +42,17 @@ void LaserPointerMode::OnDisable() {
 }
 
 const gfx::VectorIcon& LaserPointerMode::GetActiveTrayIcon() const {
-  return kPaletteTrayIconLaserPointerIcon;
+  if (AshColorProvider::Get()->IsDarkModeEnabled())
+    return kPaletteTrayIconLaserPointerIcon;
+
+  return kPaletteTrayIconLaserPointerLightModeIcon;
 }
 
 const gfx::VectorIcon& LaserPointerMode::GetPaletteIcon() const {
-  return kPaletteModeLaserPointerIcon;
+  if (AshColorProvider::Get()->IsDarkModeEnabled())
+    return kPaletteModeLaserPointerIcon;
+
+  return kPaletteModeLaserPointerLightModeIcon;
 }
 
 views::View* LaserPointerMode::CreateView() {