Skip to content

GitLab

T
tangled
Commit 55ebd974 authored by Xiqi Ruan's avatar Xiqi Ruan Committed by Commit Bot
Browse files
Options

cros: Update supervised user icon 

Change the supervised user icon used throughout Chrome OS to the new family experience kite icon.
Rename some files to supervised_user suffix.

Bug: 1058516
Change-Id: Ief22e51de73b0675c0a9a18969dac8627d9ad30d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146080Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Commit-Queue: Xiqi Ruan <xiqiruan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760180}
parent 81bb7a17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 403 additions and 216 deletions
ash/public/cpp/vector_icons/notification_supervised_user.icon
View file @ 55ebd974
...@@ -2,27 +2,29 @@ ...@@ -2,27 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
CANVAS_DIMENSIONS, 96, CANVAS_DIMENSIONS, 20,
MOVE_TO, 49.54f, 9.6f, MOVE_TO, 15.72f, 7.94f,
LINE_TO, 22.24f, 38.41f, R_LINE_TO, -4.5f, -4.63f,
R_LINE_TO, 23.61f, 35.97f, R_CUBIC_TO, -0.2f, -0.21f, -0.46f, -0.31f, -0.72f, -0.31f,
R_LINE_TO, -1.91f, 2.88f, R_CUBIC_TO, -0.26f, 0, -0.52f, 0.1f, -0.72f, 0.31f,
R_CUBIC_TO, -0.2f, 0.32f, -0.44f, 0.58f, -0.68f, 0.86f, R_LINE_TO, -4.5f, 4.63f,
R_CUBIC_TO, -1.16f, 1.19f, -2.66f, 1.87f, -4.3f, 1.87f, R_CUBIC_TO, -0.33f, 0.34f, -0.37f, 0.87f, -0.11f, 1.26f,
R_CUBIC_TO, -1.64f, 0, -3.14f, -0.65f, -4.3f, -1.87f, R_LINE_TO, 4.72f, 7.09f,
R_CUBIC_TO, -1.16f, -1.22f, -1.77f, -2.81f, -1.77f, -4.54f, R_CUBIC_TO, -0.2f, 0.42f, -0.62f, 0.71f, -1.11f, 0.71f,
R_CUBIC_TO, 0, -3.42f, -1.26f, -6.62f, -3.55f, -9.04f, R_CUBIC_TO, -0.62f, 0, -1.15f, -0.46f, -1.24f, -1.07f,
R_CUBIC_TO, -2.29f, -2.41f, -5.32f, -3.74f, -8.56f, -3.74f, ARC_TO, 2.25f, 2.25f, 0, 0, 0, 5.32f, 14,
H_LINE_TO, 19.2f, R_CUBIC_TO, -0.87f, 0, -1.68f, 0.51f, -2.04f, 1.31f,
R_V_LINE_TO, 6.41f, R_LINE_TO, 0.91f, 0.42f,
R_H_LINE_TO, 1.57f, R_CUBIC_TO, 0.19f, -0.44f, 0.64f, -0.73f, 1.13f, -0.73f,
R_CUBIC_TO, 1.64f, 0, 3.14f, 0.65f, 4.3f, 1.87f, R_CUBIC_TO, 0.62f, 0, 1.15f, 0.46f, 1.24f, 1.07f,
R_CUBIC_TO, 1.16f, 1.22f, 1.77f, 2.81f, 1.77f, 4.54f, ARC_TO, 2.25f, 2.25f, 0, 0, 0, 8.78f, 18,
R_CUBIC_TO, 0, 3.42f, 1.26f, 6.63f, 3.55f, 9.04f, R_CUBIC_TO, 0.69f, 0, 1.3f, -0.32f, 1.71f, -0.81f,
R_CUBIC_TO, 2.29f, 2.41f, 5.32f, 3.75f, 8.57f, 3.75f, R_LINE_TO, 5.33f, -7.99f,
R_CUBIC_TO, 3.24f, 0, 6.28f, -1.33f, 8.57f, -3.74f, R_CUBIC_TO, 0.27f, -0.39f, 0.23f, -0.92f, -0.1f, -1.26f,
R_ARC_TO, 15.42f, 15.42f, 0, 0, 0, 1.37f, -1.69f, CLOSE,
R_LINE_TO, 6.11f, -9.32f, R_MOVE_TO, -5.22f, 7.45f,
LINE_TO, 76.8f, 38.41f, LINE_TO, 6, 8.63f,
LINE_TO, 49.54f, 9.6f, LINE_TO, 10.5f, 4,
R_LINE_TO, 4.49f, 4.65f,
R_LINE_TO, -4.49f, 6.74f,
CLOSE CLOSE
ash/resources/vector_icons/BUILD.gn
View file @ 55ebd974
# Copyright 2016 The Chromium Authors. All rights reserved. # Copyright 2016 The Chromium Authors.All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD - style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/chrome_build.gni") import("//build/config/chrome_build.gni")
import("//components/vector_icons/vector_icons.gni") import("//components/vector_icons/vector_icons.gni")
aggregate_vector_icons("ash_vector_icons") { aggregate_vector_icons("ash_vector_icons") {
...@@ -172,7 +172,6 @@ aggregate_vector_icons("ash_vector_icons") { ...@@ -172,7 +172,6 @@ aggregate_vector_icons("ash_vector_icons") {
"system_menu_cast_enabled.icon", "system_menu_cast_enabled.icon",
"system_menu_cast_generic.icon", "system_menu_cast_generic.icon",
"system_menu_cast_message.icon", "system_menu_cast_message.icon",
"system_menu_child_user.icon",
"system_menu_computer.icon", "system_menu_computer.icon",
"system_menu_gamepad.icon", "system_menu_gamepad.icon",
"system_menu_guest.icon", "system_menu_guest.icon",
...@@ -182,6 +181,7 @@ aggregate_vector_icons("ash_vector_icons") { ...@@ -182,6 +181,7 @@ aggregate_vector_icons("ash_vector_icons") {
"system_menu_info.icon", "system_menu_info.icon",
"system_menu_keyboard.icon", "system_menu_keyboard.icon",
"system_menu_keyboard_brightness.icon", "system_menu_keyboard_brightness.icon",
"system_menu_legacy_supervised_user.icon",
"system_menu_lock.icon", "system_menu_lock.icon",
"system_menu_mouse.icon", "system_menu_mouse.icon",
"system_menu_phone.icon", "system_menu_phone.icon",
...@@ -211,7 +211,7 @@ aggregate_vector_icons("ash_vector_icons") { ...@@ -211,7 +211,7 @@ aggregate_vector_icons("ash_vector_icons") {
"system_tray_caps_lock.icon", "system_tray_caps_lock.icon",
"system_tray_cast.icon", "system_tray_cast.icon",
"system_tray_do_not_disturb.icon", "system_tray_do_not_disturb.icon",
"system_tray_family_link.icon", "system_tray_supervised_user.icon",
"system_tray_managed.icon", "system_tray_managed.icon",
"system_tray_notification_counter_plus.icon", "system_tray_notification_counter_plus.icon",
"system_tray_recording.icon", "system_tray_recording.icon",
......
ash/resources/vector_icons/system_menu_child_user.icon deleted 100644 → 0
View file @ 81bb7a17
CANVAS_DIMENSIONS, 40,
MOVE_TO, 20.64f, 4,
LINE_TO, 9.27f, 16,
R_LINE_TO, 9.84f, 14.99f,
R_LINE_TO, -0.8f, 1.2f,
R_CUBIC_TO, -0.08f, 0.14f, -0.18f, 0.24f, -0.28f, 0.36f,
R_CUBIC_TO, -0.48f, 0.5f, -1.11f, 0.78f, -1.79f, 0.78f,
R_CUBIC_TO, -0.68f, 0, -1.31f, -0.27f, -1.79f, -0.78f,
R_ARC_TO, 2.71f, 2.71f, 0, 0, 1, -0.74f, -1.89f,
R_ARC_TO, 5.44f, 5.44f, 0, 0, 0, -1.48f, -3.76f,
R_CUBIC_TO, -0.95f, -1.01f, -2.22f, -1.56f, -3.57f, -1.56f,
H_LINE_TO, 8,
R_V_LINE_TO, 2.67f,
R_H_LINE_TO, 0.65f,
R_CUBIC_TO, 0.68f, 0, 1.31f, 0.27f, 1.79f, 0.78f,
R_CUBIC_TO, 0.48f, 0.51f, 0.74f, 1.17f, 0.74f, 1.89f,
R_ARC_TO, 5.44f, 5.44f, 0, 0, 0, 1.48f, 3.77f,
R_CUBIC_TO, 0.95f, 1, 2.22f, 1.56f, 3.57f, 1.56f,
R_CUBIC_TO, 1.35f, 0, 2.62f, -0.56f, 3.57f, -1.56f,
R_CUBIC_TO, 0.21f, -0.22f, 0.4f, -0.46f, 0.57f, -0.7f,
R_LINE_TO, 2.55f, -3.89f,
LINE_TO, 32, 16,
LINE_TO, 20.64f, 4,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 10.32f, 2,
LINE_TO, 4.63f, 8,
R_LINE_TO, 4.92f, 7.5f,
R_LINE_TO, -0.4f, 0.6f,
R_CUBIC_TO, -0.04f, 0.07f, -0.09f, 0.12f, -0.14f, 0.18f,
R_CUBIC_TO, -0.24f, 0.25f, -0.56f, 0.39f, -0.9f, 0.39f,
R_CUBIC_TO, -0.34f, 0, -0.65f, -0.13f, -0.9f, -0.39f,
R_ARC_TO, 1.35f, 1.35f, 0, 0, 1, -0.37f, -0.94f,
R_ARC_TO, 2.72f, 2.72f, 0, 0, 0, -0.74f, -1.88f,
R_ARC_TO, 2.44f, 2.44f, 0, 0, 0, -1.78f, -0.78f,
H_LINE_TO, 4,
R_V_LINE_TO, 1.34f,
R_H_LINE_TO, 0.33f,
R_CUBIC_TO, 0.34f, 0, 0.65f, 0.14f, 0.9f, 0.39f,
R_CUBIC_TO, 0.24f, 0.26f, 0.37f, 0.59f, 0.37f, 0.95f,
R_CUBIC_TO, 0, 0.71f, 0.26f, 1.38f, 0.74f, 1.88f,
R_CUBIC_TO, 0.48f, 0.5f, 1.11f, 0.78f, 1.78f, 0.78f,
R_CUBIC_TO, 0.67f, 0, 1.31f, -0.28f, 1.78f, -0.78f,
R_CUBIC_TO, 0.11f, -0.11f, 0.2f, -0.23f, 0.28f, -0.35f,
R_LINE_TO, 1.27f, -1.94f,
LINE_TO, 16, 8,
LINE_TO, 10.32f, 2,
CLOSE
ash/resources/vector_icons/system_menu_legacy_supervised_user.icon 0 → 100644
View file @ 55ebd974
// 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, 27.65f, 20.17f,
R_ARC_TO, 4.22f, 4.22f, 0, 1, 0, 0, -8.45f,
R_CUBIC_TO, -2.35f, 0, -4.25f, 1.89f, -4.25f, 4.23f,
R_CUBIC_TO, 0, 2.33f, 1.9f, 4.23f, 4.25f, 4.23f,
CLOSE,
R_MOVE_TO, -12.75f, -1.69f,
R_ARC_TO, 5.06f, 5.06f, 0, 0, 0, 5.08f, -5.07f,
ARC_TO, 5.06f, 5.06f, 0, 0, 0, 14.9f, 8.33f,
R_CUBIC_TO, -2.82f, 0, -5.1f, 2.27f, -5.1f, 5.07f,
R_CUBIC_TO, 0, 2.8f, 2.28f, 5.07f, 5.1f, 5.07f,
CLOSE,
R_MOVE_TO, 12.6f, 5.07f,
R_CUBIC_TO, -3.16f, 0, -9.5f, 1.56f, -9.5f, 4.65f,
V_LINE_TO, 32,
R_H_LINE_TO, 19,
R_V_LINE_TO, -3.8f,
R_CUBIC_TO, 0, -3.09f, -6.34f, -4.65f, -9.5f, -4.65f,
CLOSE,
R_MOVE_TO, -12.6f, -1.69f,
R_CUBIC_TO, -3.96f, 0, -11.9f, 1.98f, -11.9f, 5.92f,
V_LINE_TO, 32,
R_H_LINE_TO, 11.9f,
R_V_LINE_TO, -3.8f,
R_CUBIC_TO, 0, -1.44f, 0.56f, -3.95f, 4.03f, -5.87f,
R_CUBIC_TO, -1.48f, -0.3f, -2.91f, -0.47f, -4.03f, -0.47f,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 14.05f, 10,
R_CUBIC_TO, 1.24f, 0, 2.24f, -0.96f, 2.24f, -2.14f,
R_CUBIC_TO, 0, -1.18f, -1, -2.14f, -2.24f, -2.14f,
R_CUBIC_TO, -1.24f, 0, -2.25f, 0.96f, -2.25f, 2.14f,
CUBIC_TO, 11.8f, 9.04f, 12.81f, 10, 14.05f, 10,
CLOSE,
MOVE_TO, 7.3f, 9.14f,
R_CUBIC_TO, 1.49f, 0, 2.69f, -1.15f, 2.69f, -2.57f,
CUBIC_TO, 9.99f, 5.15f, 8.79f, 4, 7.3f, 4,
CUBIC_TO, 5.81f, 4, 4.6f, 5.15f, 4.6f, 6.57f,
R_CUBIC_TO, 0, 1.42f, 1.21f, 2.57f, 2.7f, 2.57f,
CLOSE,
MOVE_TO, 9, 14,
R_V_LINE_TO, 2,
R_H_LINE_TO, 10,
R_V_LINE_TO, -1.93f,
CUBIC_TO, 19, 12.5f, 15.52f, 11, 14, 11,
R_CUBIC_TO, -1.52f, 0, -5, 1.5f, -5, 3,
CLOSE,
R_MOVE_TO, -8, -0.14f,
V_LINE_TO, 16,
R_H_LINE_TO, 7,
R_V_LINE_TO, -2,
R_CUBIC_TO, 0, -0.73f, 0, -2, 2, -2.9f,
R_CUBIC_TO, -0.83f, -0.15f, -1.87f, 0, -2.5f, 0,
R_CUBIC_TO, -2.24f, 0, -6.5f, 0.76f, -6.5f, 2.76f,
CLOSE
ash/resources/vector_icons/system_menu_supervised_user.icon
View file @ 55ebd974
...@@ -3,58 +3,63 @@ ...@@ -3,58 +3,63 @@
// found in the LICENSE file. // found in the LICENSE file.
CANVAS_DIMENSIONS, 40, CANVAS_DIMENSIONS, 40,
MOVE_TO, 27.65f, 20.17f, MOVE_TO, 9.27f, 16,
R_ARC_TO, 4.22f, 4.22f, 0, 1, 0, 0, -8.45f, LINE_TO, 20.64f, 4,
R_CUBIC_TO, -2.35f, 0, -4.25f, 1.89f, -4.25f, 4.23f, LINE_TO, 32, 16,
R_CUBIC_TO, 0, 2.33f, 1.9f, 4.23f, 4.25f, 4.23f, LINE_TO, 20.37f, 33.73f,
CUBIC_TO, 20.2f, 33.97f, 20.02f, 34.21f, 19.8f, 34.44f,
CUBIC_TO, 18.85f, 35.45f, 17.58f, 36, 16.23f, 36,
CUBIC_TO, 14.88f, 36, 13.62f, 35.45f, 12.66f, 34.44f,
CUBIC_TO, 11.71f, 33.43f, 11.18f, 32.1f, 11.18f, 30.68f,
CUBIC_TO, 11.18f, 29.95f, 10.93f, 29.29f, 10.45f, 28.79f,
CUBIC_TO, 9.96f, 28.27f, 9.34f, 28, 8.65f, 28,
LINE_TO, 8, 28,
LINE_TO, 8, 25.33f,
LINE_TO, 8.65f, 25.33f,
CUBIC_TO, 10, 25.33f, 11.27f, 25.89f, 12.22f, 26.89f,
CUBIC_TO, 13.18f, 27.9f, 13.7f, 29.23f, 13.7f, 30.66f,
CUBIC_TO, 13.7f, 31.38f, 13.96f, 32.04f, 14.44f, 32.55f,
CUBIC_TO, 14.93f, 33.06f, 15.55f, 33.33f, 16.23f, 33.33f,
CUBIC_TO, 16.91f, 33.33f, 17.54f, 33.04f, 18.02f, 32.55f,
CUBIC_TO, 18.05f, 32.52f, 18.07f, 32.49f, 18.1f, 32.46f,
CUBIC_TO, 18.17f, 32.38f, 18.24f, 32.29f, 18.31f, 32.19f,
LINE_TO, 19.11f, 30.99f,
CLOSE, CLOSE,
R_MOVE_TO, -12.75f, -1.69f, MOVE_TO, 20.64f, 27.88f,
R_ARC_TO, 5.06f, 5.06f, 0, 0, 0, 5.08f, -5.07f, LINE_TO, 13.07f, 16.34f,
ARC_TO, 5.06f, 5.06f, 0, 0, 0, 14.9f, 8.33f, LINE_TO, 20.64f, 8.36f,
R_CUBIC_TO, -2.82f, 0, -5.1f, 2.27f, -5.1f, 5.07f, LINE_TO, 28.19f, 16.34f,
R_CUBIC_TO, 0, 2.8f, 2.28f, 5.07f, 5.1f, 5.07f,
CLOSE, CLOSE,
R_MOVE_TO, 12.6f, 5.07f, MOVE_TO, 20.64f, 27.88f,
R_CUBIC_TO, -3.16f, 0, -9.5f, 1.56f, -9.5f, 4.65f,
V_LINE_TO, 32,
R_H_LINE_TO, 19,
R_V_LINE_TO, -3.8f,
R_CUBIC_TO, 0, -3.09f, -6.34f, -4.65f, -9.5f, -4.65f,
CLOSE,
R_MOVE_TO, -12.6f, -1.69f,
R_CUBIC_TO, -3.96f, 0, -11.9f, 1.98f, -11.9f, 5.92f,
V_LINE_TO, 32,
R_H_LINE_TO, 11.9f,
R_V_LINE_TO, -3.8f,
R_CUBIC_TO, 0, -1.44f, 0.56f, -3.95f, 4.03f, -5.87f,
R_CUBIC_TO, -1.48f, -0.3f, -2.91f, -0.47f, -4.03f, -0.47f,
CLOSE CLOSE
CANVAS_DIMENSIONS, 20, CANVAS_DIMENSIONS, 20,
MOVE_TO, 14.05f, 10, MOVE_TO, 4.63f, 8,
R_CUBIC_TO, 1.24f, 0, 2.24f, -0.96f, 2.24f, -2.14f, LINE_TO, 10.32f, 2,
R_CUBIC_TO, 0, -1.18f, -1, -2.14f, -2.24f, -2.14f, LINE_TO, 16, 8,
R_CUBIC_TO, -1.24f, 0, -2.25f, 0.96f, -2.25f, 2.14f, LINE_TO, 10.18f, 16.87f,
CUBIC_TO, 11.8f, 9.04f, 12.81f, 10, 14.05f, 10, CUBIC_TO, 10.1f, 16.99f, 10.01f, 17.11f, 9.9f, 17.22f,
CLOSE, CUBIC_TO, 9.42f, 17.72f, 8.79f, 18, 8.12f, 18,
MOVE_TO, 7.3f, 9.14f, CUBIC_TO, 7.44f, 18, 6.81f, 17.72f, 6.33f, 17.22f,
R_CUBIC_TO, 1.49f, 0, 2.69f, -1.15f, 2.69f, -2.57f, CUBIC_TO, 5.86f, 16.72f, 5.59f, 16.05f, 5.59f, 15.34f,
CUBIC_TO, 9.99f, 5.15f, 8.79f, 4, 7.3f, 4, CUBIC_TO, 5.59f, 14.98f, 5.46f, 14.65f, 5.22f, 14.39f,
CUBIC_TO, 5.81f, 4, 4.6f, 5.15f, 4.6f, 6.57f, CUBIC_TO, 4.98f, 14.14f, 4.67f, 14, 4.33f, 14,
R_CUBIC_TO, 0, 1.42f, 1.21f, 2.57f, 2.7f, 2.57f, H_LINE_TO, 4,
CLOSE, V_LINE_TO, 12.67f,
MOVE_TO, 9, 14, H_LINE_TO, 4.33f,
R_V_LINE_TO, 2, CUBIC_TO, 5, 12.67f, 5.64f, 12.94f, 6.11f, 13.45f,
R_H_LINE_TO, 10, CUBIC_TO, 6.59f, 13.95f, 6.85f, 14.62f, 6.85f, 15.33f,
R_V_LINE_TO, -1.93f, CUBIC_TO, 6.85f, 15.69f, 6.98f, 16.02f, 7.22f, 16.27f,
CUBIC_TO, 19, 12.5f, 15.52f, 11, 14, 11, CUBIC_TO, 7.46f, 16.53f, 7.77f, 16.66f, 8.12f, 16.66f,
R_CUBIC_TO, -1.52f, 0, -5, 1.5f, -5, 3, CUBIC_TO, 8.46f, 16.66f, 8.77f, 16.52f, 9.01f, 16.27f,
CUBIC_TO, 9.02f, 16.26f, 9.04f, 16.25f, 9.05f, 16.23f,
CUBIC_TO, 9.09f, 16.19f, 9.12f, 16.15f, 9.15f, 16.09f,
LINE_TO, 9.55f, 15.49f,
LINE_TO, 4.63f, 8,
CLOSE, CLOSE,
R_MOVE_TO, -8, -0.14f, MOVE_TO, 10.32f, 13.94f,
V_LINE_TO, 16, LINE_TO, 6.54f, 8.17f,
R_H_LINE_TO, 7, LINE_TO, 10.32f, 4.18f,
R_V_LINE_TO, -2, LINE_TO, 14.1f, 8.17f,
R_CUBIC_TO, 0, -0.73f, 0, -2, 2, -2.9f, LINE_TO, 10.32f, 13.94f,
R_CUBIC_TO, -0.83f, -0.15f, -1.87f, 0, -2.5f, 0,
R_CUBIC_TO, -2.24f, 0, -6.5f, 0.76f, -6.5f, 2.76f,
CLOSE CLOSE
ash/resources/vector_icons/system_tray_family_link.icon deleted 100644 → 0
View file @ 81bb7a17
// Copyright 2018 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.32f, 2,
LINE_TO, 4.63f, 8,
R_LINE_TO, 4.92f, 7.5f,
R_LINE_TO, -0.4f, 0.6f,
R_CUBIC_TO, -0.04f, 0.07f, -0.09f, 0.12f, -0.14f, 0.18f,
R_CUBIC_TO, -0.24f, 0.25f, -0.56f, 0.39f, -0.9f, 0.39f,
R_CUBIC_TO, -0.34f, 0, -0.65f, -0.13f, -0.9f, -0.39f,
R_ARC_TO, 1.35f, 1.35f, 0, 0, 1, -0.37f, -0.94f,
R_ARC_TO, 2.72f, 2.72f, 0, 0, 0, -0.74f, -1.88f,
R_ARC_TO, 2.44f, 2.44f, 0, 0, 0, -1.78f, -0.78f,
H_LINE_TO, 4,
R_V_LINE_TO, 1.34f,
R_H_LINE_TO, 0.33f,
R_CUBIC_TO, 0.34f, 0, 0.65f, 0.14f, 0.9f, 0.39f,
R_CUBIC_TO, 0.24f, 0.26f, 0.37f, 0.59f, 0.37f, 0.95f,
R_CUBIC_TO, 0, 0.71f, 0.26f, 1.38f, 0.74f, 1.88f,
R_CUBIC_TO, 0.48f, 0.5f, 1.11f, 0.78f, 1.78f, 0.78f,
R_CUBIC_TO, 0.67f, 0, 1.31f, -0.28f, 1.78f, -0.78f,
R_CUBIC_TO, 0.11f, -0.11f, 0.2f, -0.23f, 0.28f, -0.35f,
R_LINE_TO, 1.27f, -1.94f,
LINE_TO, 16, 8,
LINE_TO, 10.32f, 2,
CLOSE
ash/resources/vector_icons/system_tray_supervised_user.icon 0 → 100644
View file @ 55ebd974
// Copyright 2018 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.72f, 7.94f,
R_LINE_TO, -4.5f, -4.63f,
R_CUBIC_TO, -0.2f, -0.21f, -0.46f, -0.31f, -0.72f, -0.31f,
R_CUBIC_TO, -0.26f, 0, -0.52f, 0.1f, -0.72f, 0.31f,
R_LINE_TO, -4.5f, 4.63f,
R_CUBIC_TO, -0.33f, 0.34f, -0.37f, 0.87f, -0.11f, 1.26f,
R_LINE_TO, 4.72f, 7.09f,
R_CUBIC_TO, -0.2f, 0.42f, -0.62f, 0.71f, -1.11f, 0.71f,
R_CUBIC_TO, -0.62f, 0, -1.15f, -0.46f, -1.24f, -1.07f,
ARC_TO, 2.25f, 2.25f, 0, 0, 0, 5.32f, 14,
R_CUBIC_TO, -0.87f, 0, -1.68f, 0.51f, -2.04f, 1.31f,
R_LINE_TO, 0.91f, 0.42f,
R_CUBIC_TO, 0.19f, -0.44f, 0.64f, -0.73f, 1.13f, -0.73f,
R_CUBIC_TO, 0.62f, 0, 1.15f, 0.46f, 1.24f, 1.07f,
ARC_TO, 2.25f, 2.25f, 0, 0, 0, 8.78f, 18,
R_CUBIC_TO, 0.69f, 0, 1.3f, -0.32f, 1.71f, -0.81f,
R_LINE_TO, 5.33f, -7.99f,
R_CUBIC_TO, 0.27f, -0.39f, 0.23f, -0.92f, -0.1f, -1.26f,
CLOSE,
R_MOVE_TO, -5.22f, 7.45f,
LINE_TO, 6, 8.63f,
LINE_TO, 10.5f, 4,
R_LINE_TO, 4.49f, 4.65f,
R_LINE_TO, -4.49f, 6.74f,
CLOSE
ash/system/supervised/supervised_icon_string.cc
View file @ 55ebd974
...@@ -21,9 +21,9 @@ const gfx::VectorIcon& GetSupervisedUserIcon() { ...@@ -21,9 +21,9 @@ const gfx::VectorIcon& GetSupervisedUserIcon() {
if (session_controller->IsUserSupervised() && if (session_controller->IsUserSupervised() &&
session_controller->IsUserChild()) session_controller->IsUserChild())
return kSystemMenuChildUserIcon; return kSystemMenuSupervisedUserIcon;
return kSystemMenuSupervisedUserIcon; return kSystemMenuLegacySupervisedUserIcon;
} }
base::string16 GetSupervisedUserMessage() { base::string16 GetSupervisedUserMessage() {
......
ash/system/unified/managed_device_tray_item_view.cc
View file @ 55ebd974
...@@ -68,7 +68,7 @@ void ManagedDeviceTrayItemView::Update() { ...@@ -68,7 +68,7 @@ void ManagedDeviceTrayItemView::Update() {
} }
} else if (session->IsUserChild()) { } else if (session->IsUserChild()) {
image_view()->SetImage(gfx::CreateVectorIcon( image_view()->SetImage(gfx::CreateVectorIcon(
kSystemTrayFamilyLinkIcon, kSystemTraySupervisedUserIcon,
TrayIconColor(Shell::Get()->session_controller()->GetSessionState()))); TrayIconColor(Shell::Get()->session_controller()->GetSessionState())));
image_view()->set_tooltip_text( image_view()->set_tooltip_text(
l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_FAMILY_LINK_LABEL)); l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_FAMILY_LINK_LABEL));
......
chrome/browser/apps/app_service/app_service_proxy.cc
View file @ 55ebd974
...@@ -618,7 +618,7 @@ void AppServiceProxy::LoadIconForDialog( ...@@ -618,7 +618,7 @@ void AppServiceProxy::LoadIconForDialog(
// Load the family link kite logo icon for the app pause dialog or the app // Load the family link kite logo icon for the app pause dialog or the app
// block dialog for the child profile. // block dialog for the child profile.
LoadIconFromResource(apps::mojom::IconCompression::kUncompressed, kIconSize, LoadIconFromResource(apps::mojom::IconCompression::kUncompressed, kIconSize,
IDR_FAMILY_LINK_LOGO, kAllowPlaceholderIcon, IDR_SUPERVISED_USER_ICON, kAllowPlaceholderIcon,
IconEffects::kNone, std::move(callback)); IconEffects::kNone, std::move(callback));
} }
......
chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.css
View file @ 55ebd974
...@@ -104,7 +104,7 @@ p { ...@@ -104,7 +104,7 @@ p {
#family-link-kite { #family-link-kite {
content: -webkit-image-set( content: -webkit-image-set(
url(default_100_percent/family_link_logo.png) 1x); url(../../resources/supervised_user_icon.png) 1x);
height: 72px; height: 72px;
width: 72px; width: 72px;
} }
......
chrome/browser/supervised_user/supervised_user_unscaled_resources.grd
View file @ 55ebd974
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</outputs> </outputs>
<release seq="1"> <release seq="1">
<includes> <includes>
<include name="IDR_FAMILY_LINK_LOGO" file="supervised_user_error_page/resources/default_100_percent/family_link_logo.png" type="BINDATA" /> <include name="IDR_SUPERVISED_USER_ICON" file="resources/supervised_user_icon.png" type="BINDATA" />
</includes> </includes>
</release> </release>
</grit> </grit>
ui/webui/resources/cr_elements/icons.html
View file @ 55ebd974
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment