Commit 464a5887 authored by Mitsuru Oshima's avatar Mitsuru Oshima Committed by Commit Bot

Add menu/zoom icons.

These will be used for ARC++ windows.

This also moves the back button asset to ash/public/cpp/vector_icons
where they should be.

BUG=822960

Change-Id: Ie26b11c1eacbef8cce9e6f07a17ba8daf2c80754
Reviewed-on: https://chromium-review.googlesource.com/966942Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543895}
parent 940d7dfd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "ash/ash_layout_constants.h" #include "ash/ash_layout_constants.h"
#include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/frame/caption_buttons/frame_caption_button.h"
#include "ash/resources/vector_icons/vector_icons.h" #include "ash/public/cpp/vector_icons/vector_icons.h"
#include "ash/strings/grit/ash_strings.h" #include "ash/strings/grit/ash_strings.h"
#include "ui/aura/window.h" #include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h" #include "ui/aura/window_tree_host.h"
......
...@@ -39,6 +39,14 @@ aggregate_vector_icons("ash_public_vector_icons") { ...@@ -39,6 +39,14 @@ aggregate_vector_icons("ash_public_vector_icons") {
"window_control_minimize.icon", "window_control_minimize.icon",
"window_control_restore.1x.icon", "window_control_restore.1x.icon",
"window_control_restore.icon", "window_control_restore.icon",
"window_control_back.1x.icon",
"window_control_back.icon",
"window_control_menu.1x.icon",
"window_control_menu.icon",
"window_control_zoom.1x.icon",
"window_control_zoom.icon",
"window_control_dezoom.1x.icon",
"window_control_dezoom.icon",
] ]
} }
......
CANVAS_DIMENSIONS, 12,
MOVE_TO, 7, 0,
LINE_TO, 9, 0,
LINE_TO, 9, 3,
LINE_TO, 12, 3,
LINE_TO, 12, 5,
LINE_TO, 7, 5,
LINE_TO, 7, 0,
CLOSE,
MOVE_TO, 0, 7,
LINE_TO, 5, 7,
LINE_TO, 5, 12,
LINE_TO, 3, 12,
LINE_TO, 3, 9,
LINE_TO, 0, 9,
LINE_TO, 0, 7,
CLOSE
CANVAS_DIMENSIONS, 24,
MOVE_TO, 14, 0,
R_H_LINE_TO, 4,
R_V_LINE_TO, 6,
R_H_LINE_TO, 6,
R_V_LINE_TO, 4,
H_LINE_TO, 14,
V_LINE_TO, 0,
CLOSE,
MOVE_TO, 0, 14,
R_H_LINE_TO, 10,
R_V_LINE_TO, 10,
H_LINE_TO, 6,
R_V_LINE_TO, -6,
H_LINE_TO, 0,
R_V_LINE_TO, -4,
CLOSE
CANVAS_DIMENSIONS, 12,
MOVE_TO, 6, 3,
R_CUBIC_TO, 0.83f, 0, 1.5f, -0.67f, 1.5f, -1.5f,
CUBIC_TO_SHORTHAND, 6.83f, 0, 6, 0,
CUBIC_TO_SHORTHAND, 4.5f, 0.68f, 4.5f, 1.5f,
CUBIC_TO_SHORTHAND, 5.18f, 3, 6, 3,
CLOSE,
R_MOVE_TO, 0, 1.5f,
R_CUBIC_TO, -0.82f, 0, -1.5f, 0.68f, -1.5f, 1.5f,
CUBIC_TO_SHORTHAND, 5.18f, 7.5f, 6, 7.5f,
CUBIC_TO_SHORTHAND, 7.5f, 6.83f, 7.5f, 6,
CUBIC_TO_SHORTHAND, 6.83f, 4.5f, 6, 4.5f,
CLOSE,
MOVE_TO, 6, 9,
R_CUBIC_TO, -0.82f, 0, -1.5f, 0.68f, -1.5f, 1.5f,
CUBIC_TO_SHORTHAND, 5.18f, 12, 6, 12,
R_CUBIC_TO, 0.82f, 0, 1.5f, -0.67f, 1.5f, -1.5f,
CUBIC_TO_SHORTHAND, 6.83f, 9, 6, 9,
CLOSE
CANVAS_DIMENSIONS, 24,
MOVE_TO, 12, 6,
R_CUBIC_TO, 1.65f, 0, 3, -1.35f, 3, -3,
R_CUBIC_TO, 0, -1.65f, -1.35f, -3, -3, -3,
R_CUBIC_TO, -1.65f, 0, -3, 1.35f, -3, 3,
R_CUBIC_TO, 0, 1.65f, 1.35f, 3, 3, 3,
CLOSE,
R_MOVE_TO, 0, 3,
R_CUBIC_TO, -1.65f, 0, -3, 1.35f, -3, 3,
R_CUBIC_TO, 0, 1.65f, 1.35f, 3, 3, 3,
R_CUBIC_TO, 1.65f, 0, 3, -1.35f, 3, -3,
R_CUBIC_TO, 0, -1.65f, -1.35f, -3, -3, -3,
CLOSE,
R_MOVE_TO, 0, 9,
R_CUBIC_TO, -1.65f, 0, -3, 1.35f, -3, 3,
R_CUBIC_TO, 0, 1.65f, 1.35f, 3, 3, 3,
R_CUBIC_TO, 1.65f, 0, 3, -1.35f, 3, -3,
R_CUBIC_TO, 0, -1.65f, -1.35f, -3, -3, -3,
CLOSE
CANVAS_DIMENSIONS, 12,
MOVE_TO, 7, 0,
R_H_LINE_TO, 5,
R_V_LINE_TO, 5,
R_H_LINE_TO, -2,
V_LINE_TO, 2,
H_LINE_TO, 7,
V_LINE_TO, 0,
CLOSE,
MOVE_TO, 0, 7,
R_H_LINE_TO, 2,
R_V_LINE_TO, 3,
R_H_LINE_TO, 3,
R_V_LINE_TO, 2,
H_LINE_TO, 0,
V_LINE_TO, 7,
CLOSE
CANVAS_DIMENSIONS, 24,
MOVE_TO, 14, 0,
R_H_LINE_TO, 10,
R_V_LINE_TO, 10,
R_H_LINE_TO, -4,
V_LINE_TO, 4,
H_LINE_TO, 14,
V_LINE_TO, 0,
CLOSE,
MOVE_TO, 0, 14,
R_H_LINE_TO, 4,
R_V_LINE_TO, 6,
R_H_LINE_TO, 6,
R_V_LINE_TO, 4,
H_LINE_TO, 0,
V_LINE_TO, 14,
CLOSE
...@@ -299,8 +299,6 @@ aggregate_vector_icons("ash_vector_icons") { ...@@ -299,8 +299,6 @@ aggregate_vector_icons("ash_vector_icons") {
"touch_calibration_hand.icon", "touch_calibration_hand.icon",
"tray_action_new_lock_screen_note.1x.icon", "tray_action_new_lock_screen_note.1x.icon",
"tray_action_new_lock_screen_note.icon", "tray_action_new_lock_screen_note.icon",
"window_control_back.1x.icon",
"window_control_back.icon",
] ]
if (is_chrome_branded) { if (is_chrome_branded) {
......
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