Commit 191b98aa authored by Mariam Ali's avatar Mariam Ali Committed by Commit Bot

Make header asset full bleed

This CL updates the header asset design for all menus to be full bleed
by removing the 8px margin.

Screenshot: https://screenshot.googleplex.com/8DXjXJW4TZCsSdQ.png

Design Deck: go/alignmenus

Bug: 1105763
Change-Id: I3c4f142ca75bf1651325ddd9a5b157e15347acab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2510402
Commit-Queue: Mariam Ali <alimariam@google.com>
Reviewed-by: default avatarJan Krcal <jkrcal@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825360}
parent c9fb3206
...@@ -2,78 +2,69 @@ ...@@ -2,78 +2,69 @@
// 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, 272, CANVAS_DIMENSIONS, 288,
MOVE_TO, 209.9f, 56.8f, STROKE, 1.7,
CUBIC_TO, 209.3f, 56.2f, 208.4f, 56, 207.6f, 56.2f, MOVE_TO, 210.06f, 65.04f,
LINE_TO, 200.4f, 58.1f, LINE_TO, 212.21f, 56.9f,
CUBIC_TO, 199.6f, 58.3f, 198.9f, 59, 198.7f, 59.8f, CUBIC_TO, 212.4f, 56.06f, 213.05f, 55.41f, 213.9f, 55.22f,
LINE_TO, 196.8f, 67, LINE_TO, 222.04f, 53.07f,
CUBIC_TO, 196.6f, 67.8f, 196.8f, 68.7f, 197.4f, 69.3f, CUBIC_TO, 222.88f, 52.88f, 223.72f, 53.07f, 224.38f, 53.72f,
LINE_TO, 200, 72, LINE_TO, 230.28f, 59.62f,
H_LINE_TO, 202.1f, CUBIC_TO, 230.93f, 60.27f, 231.12f, 61.11f, 230.93f, 61.96f,
LINE_TO, 198.4f, 68.3f, LINE_TO, 228.78f, 70.1f,
CUBIC_TO, 198.2f, 68.1f, 198.1f, 67.8f, 198.2f, 67.5f, CUBIC_TO, 228.59f, 70.94f, 227.94f, 71.59f, 227.09f, 71.78f,
LINE_TO, 200.1f, 60.3f, LINE_TO, 218.95f, 73.93f,
CUBIC_TO, 200.2f, 60, 200.4f, 59.8f, 200.7f, 59.7f, CUBIC_TO, 218.11f, 74.12f, 217.27f, 73.93f, 216.61f, 73.28f,
LINE_TO, 207.9f, 57.8f, LINE_TO, 210.71f, 67.38f,
CUBIC_TO, 208.2f, 57.7f, 208.5f, 57.8f, 208.7f, 58, CUBIC_TO, 210.15f, 66.82f, 209.87f, 65.89f, 210.06f, 65.04f,
LINE_TO, 214, 63.3f,
CUBIC_TO, 214.2f, 63.5f, 214.3f, 63.8f, 214.2f, 64.1f,
LINE_TO, 212.3f, 71.3f,
CUBIC_TO, 212.2f, 71.6f, 212, 71.8f, 211.7f, 71.9f,
LINE_TO, 211.3f, 72,
H_LINE_TO, 213.7f,
CUBIC_TO, 213.7f, 71.9f, 213.8f, 71.8f, 213.8f, 71.7f,
LINE_TO, 215.7f, 64.5f,
CUBIC_TO, 215.9f, 63.7f, 215.7f, 62.8f, 215.1f, 62.2f,
LINE_TO, 209.9f, 56.8f,
CLOSE, CLOSE,
MOVE_TO, 176.1f, 6.4f, NEW_PATH,
CUBIC_TO, 176.1f, 15.3f, 183.3f, 22.5f, 192.2f, 22.5f, MOVE_TO, 184.1f, 6.4f,
CUBIC_TO, 201.1f, 22.5f, 208.3f, 15.3f, 208.3f, 6.4f, CUBIC_TO, 184.1f, 15.3f, 191.3f, 22.5f, 200.2f, 22.5f,
CUBIC_TO, 208.3f, 4.1f, 207.8f, 1.9f, 207, 0, CUBIC_TO, 209.1f, 22.5f, 216.3f, 15.3f, 216.3f, 6.4f,
H_LINE_TO, 177.5f, CUBIC_TO, 216.3f, 4.1f, 215.8f, 1.9f, 215, 0,
CUBIC_TO, 176.6f, 2, 176.1f, 4.1f, 176.1f, 6.4f, H_LINE_TO, 185.5f,
CUBIC_TO, 184.6f, 2, 184.1f, 4.1f, 184.1f, 6.4f,
CLOSE, CLOSE,
MOVE_TO, 102.5f, 18.7f, MOVE_TO, 110.5f, 22.7f,
CUBIC_TO, 105.92f, 18.7f, 108.7f, 15.92f, 108.7f, 12.5f, CUBIC_TO, 113.92f, 22.7f, 116.7f, 19.92f, 116.7f, 16.5f,
CUBIC_TO, 108.7f, 9.08f, 105.92f, 6.3f, 102.5f, 6.3f, CUBIC_TO, 116.7f, 13.08f, 113.92f, 10.3f, 110.5f, 10.3f,
CUBIC_TO, 99.08f, 6.3f, 96.3f, 9.08f, 96.3f, 12.5f, CUBIC_TO, 107.08f, 10.3f, 104.3f, 13.08f, 104.3f, 16.5f,
CUBIC_TO, 96.3f, 15.92f, 99.08f, 18.7f, 102.5f, 18.7f, CUBIC_TO, 104.3f, 19.92f, 107.08f, 22.7f, 110.5f, 22.7f,
CLOSE, CLOSE,
MOVE_TO, 56.1f, 4.9f, MOVE_TO, 64.1f, 4.9f,
CUBIC_TO, 58.3f, 8, 57.6f, 12.4f, 54.4f, 14.6f, CUBIC_TO, 66.3f, 8, 65.6f, 12.4f, 62.4f, 14.6f,
CUBIC_TO, 52.9f, 15.7f, 51, 16.1f, 49.2f, 15.8f, CUBIC_TO, 60.9f, 15.7f, 59, 16.1f, 57.2f, 15.8f,
CUBIC_TO, 47.4f, 15.5f, 45.8f, 14.5f, 44.7f, 13, CUBIC_TO, 55.4f, 15.5f, 53.8f, 14.5f, 52.7f, 13,
LINE_TO, 35.9f, 0.4f, LINE_TO, 43.9f, 0.4f,
CUBIC_TO, 35.8f, 0.3f, 35.7f, 0.1f, 35.7f, 0, CUBIC_TO, 43.8f, 0.3f, 43.7f, 0.1f, 43.7f, 0,
H_LINE_TO, 34, H_LINE_TO, 42,
CUBIC_TO, 34.2f, 0.4f, 34.4f, 0.8f, 34.7f, 1.2f, CUBIC_TO, 42.2f, 0.4f, 42.4f, 0.8f, 42.7f, 1.2f,
LINE_TO, 43.6f, 13.8f, LINE_TO, 51.6f, 13.8f,
CUBIC_TO, 44.9f, 15.6f, 46.8f, 16.9f, 49.1f, 17.3f, CUBIC_TO, 52.9f, 15.6f, 54.8f, 16.9f, 57.1f, 17.3f,
CUBIC_TO, 49.6f, 17.4f, 50.1f, 17.4f, 50.6f, 17.4f, CUBIC_TO, 57.6f, 17.4f, 58.1f, 17.4f, 58.6f, 17.4f,
CUBIC_TO, 52.3f, 17.4f, 54, 16.9f, 55.5f, 15.9f, CUBIC_TO, 60.3f, 17.4f, 62, 16.9f, 63.5f, 15.9f,
CUBIC_TO, 59.3f, 13.2f, 60.2f, 7.9f, 57.5f, 4.1f, CUBIC_TO, 67.3f, 13.2f, 68.2f, 7.9f, 65.5f, 4.1f,
LINE_TO, 54.5f, 0, LINE_TO, 62.5f, 0,
H_LINE_TO, 52.7f, H_LINE_TO, 60.7f,
LINE_TO, 56.1f, 4.9f, LINE_TO, 64.1f, 4.9f,
CLOSE, CLOSE,
MOVE_TO, 272, 27.2f, MOVE_TO, 288, 27.2f,
CUBIC_TO, 270.8f, 27.1f, 269.7f, 27.3f, 268.6f, 27.7f, CUBIC_TO, 286.8f, 27.1f, 285.7f, 27.3f, 284.6f, 27.7f,
CUBIC_TO, 267.3f, 28.2f, 265.9f, 28.3f, 264.6f, 27.8f, CUBIC_TO, 283.3f, 28.2f, 281.9f, 28.3f, 280.6f, 27.8f,
LINE_TO, 264, 27.6f, LINE_TO, 280, 27.6f,
CUBIC_TO, 262.7f, 27.1f, 261.7f, 26.1f, 261.2f, 24.8f, CUBIC_TO, 278.7f, 27.1f, 277.7f, 26.1f, 277.2f, 24.8f,
CUBIC_TO, 260.4f, 22.9f, 258.8f, 21.4f, 256.6f, 20.8f, CUBIC_TO, 276.4f, 22.9f, 274.8f, 21.4f, 272.6f, 20.8f,
CUBIC_TO, 253.4f, 19.9f, 249.8f, 21.3f, 248.2f, 24.3f, CUBIC_TO, 269.4f, 19.9f, 265.8f, 21.3f, 264.2f, 24.3f,
CUBIC_TO, 246.1f, 28.2f, 247.9f, 32.9f, 251.9f, 34.4f, CUBIC_TO, 262.1f, 28.2f, 263.9f, 32.9f, 267.9f, 34.4f,
CUBIC_TO, 253.7f, 35.1f, 255.7f, 35.1f, 257.4f, 34.4f, CUBIC_TO, 269.7f, 35.1f, 271.7f, 35.1f, 273.4f, 34.4f,
CUBIC_TO, 258.7f, 33.9f, 260.1f, 33.8f, 261.3f, 34.3f, CUBIC_TO, 274.7f, 33.9f, 276.1f, 33.8f, 277.3f, 34.3f,
LINE_TO, 261.9f, 34.5f, LINE_TO, 277.9f, 34.5f,
CUBIC_TO, 263.2f, 35, 264.2f, 36, 264.7f, 37.3f, CUBIC_TO, 279.2f, 35, 280.2f, 36, 280.7f, 37.3f,
CUBIC_TO, 265.4f, 39, 266.8f, 40.4f, 268.6f, 41.1f, CUBIC_TO, 281.4f, 39, 282.8f, 40.4f, 284.6f, 41.1f,
CUBIC_TO, 269.7f, 41.5f, 270.8f, 41.7f, 271.9f, 41.6f, CUBIC_TO, 285.7f, 41.5f, 286.8f, 41.7f, 287.9f, 41.6f,
V_LINE_TO, 27.2f, V_LINE_TO, 27.2f,
H_LINE_TO, 272, H_LINE_TO, 288,
CLOSE, CLOSE,
MOVE_TO, 0, 34.1f, MOVE_TO, 0, 34.1f,
V_LINE_TO, 56.9f, V_LINE_TO, 56.9f,
...@@ -81,24 +72,11 @@ LINE_TO, 25, 48.3f, ...@@ -81,24 +72,11 @@ LINE_TO, 25, 48.3f,
CUBIC_TO, 25.8f, 48, 26.2f, 47.1f, 25.9f, 46.3f, CUBIC_TO, 25.8f, 48, 26.2f, 47.1f, 25.9f, 46.3f,
CUBIC_TO, 21.6f, 36.2f, 10.5f, 31, 0, 34.1f, CUBIC_TO, 21.6f, 36.2f, 10.5f, 31, 0, 34.1f,
CLOSE, CLOSE,
MOVE_TO, 65.9f, 52.9f, MOVE_TO, 77.95f, 56.77f,
CUBIC_TO, 65.3f, 52.4f, 64.5f, 52.7f, 64.3f, 53.4f, LINE_TO, 55.57f, 59.54f,
LINE_TO, 60.4f, 72, CUBIC_TO, 54.42f, 59.69f, 53.82f, 60.99f, 54.52f, 61.9f,
H_LINE_TO, 65.1f, LINE_TO, 67.82f, 79.47f,
LINE_TO, 72.35f, 69.6f, CUBIC_TO, 68.53f, 80.39f, 69.94f, 80.2f, 70.44f, 79.16f,
LINE_TO, 79.6f, 67.2f, LINE_TO, 79.49f, 58.83f,
CUBIC_TO, 80.3f, 67, 80.5f, 66, 79.9f, 65.6f, CUBIC_TO, 79.94f, 57.77f, 79.11f, 56.63f, 77.95f, 56.77f,
LINE_TO, 65.9f, 52.9f, CLOSE
CLOSE,
NEW_PATH,
STROKE, 1,
MOVE_TO, 0.5f, 4,
CUBIC_TO, 0.5f, 2.07f, 2.07f, 0.5f, 4, 0.5f,
H_LINE_TO, 268,
CUBIC_TO, 269.93f, 0.5f, 271.5f, 2.07f, 271.5f, 4,
V_LINE_TO, 68,
CUBIC_TO, 271.5f, 69.93f, 269.93f, 71.5f, 268, 71.5f,
H_LINE_TO, 4,
CUBIC_TO, 2.07f, 71.5f, 0.5f, 69.93f, 0.5f, 68,
V_LINE_TO, 4,
CLOSE
\ No newline at end of file
...@@ -2,115 +2,113 @@ ...@@ -2,115 +2,113 @@
// 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, 272, CANVAS_DIMENSIONS, 288,
MOVE_TO, 203.7f, 0, MOVE_TO, 217, -1,
H_LINE_TO, 268, H_LINE_TO, 288,
CUBIC_TO, 270.21f, 0, 272, 1.79f, 272, 4, V_LINE_TO, 80,
V_LINE_TO, 69, H_LINE_TO, 274.16f,
CUBIC_TO, 272, 71.21f, 270.21f, 73, 268, 73, LINE_TO, 272.69f, 67.98f,
H_LINE_TO, 259.4f, CUBIC_TO, 270.89f, 68.5f, 268.99f, 68.82f, 266.99f, 68.82f,
LINE_TO, 258, 61.6f, CUBIC_TO, 256.97f, 68.82f, 248.85f, 61.12f, 247.9f, 51.2f,
CUBIC_TO, 256.3f, 62.1f, 254.5f, 62.4f, 252.6f, 62.4f, CUBIC_TO, 242.52f, 47.83f, 238.19f, 49.94f, 236.61f, 51.1f,
CUBIC_TO, 243.1f, 62.4f, 235.4f, 55.1f, 234.5f, 45.7f, CUBIC_TO, 235.87f, 61.01f, 227.65f, 68.82f, 217.52f, 68.82f,
CUBIC_TO, 229.4f, 42.5f, 225.3f, 44.5f, 223.8f, 45.6f, CUBIC_TO, 206.87f, 68.82f, 198.32f, 60.17f, 198.32f, 49.62f,
CUBIC_TO, 223.1f, 55, 215.3f, 62.4f, 205.7f, 62.4f, CUBIC_TO, 198.32f, 38.97f, 206.97f, 30.42f, 217.52f, 30.42f,
CUBIC_TO, 195.6f, 62.4f, 187.5f, 54.2f, 187.5f, 44.2f, CUBIC_TO, 226.59f, 30.42f, 234.19f, 36.75f, 236.19f, 45.3f,
CUBIC_TO, 187.5f, 34.1f, 195.7f, 26, 205.7f, 26, CUBIC_TO, 239.35f, 43.93f, 243.68f, 43.4f, 248.32f, 45.4f,
CUBIC_TO, 214.3f, 26, 221.5f, 32, 223.4f, 40.1f, CUBIC_TO, 250.32f, 36.86f, 257.92f, 30.53f, 266.99f, 30.53f,
CUBIC_TO, 226.4f, 38.8f, 230.5f, 38.3f, 234.9f, 40.2f, H_LINE_TO, 268.26f,
CUBIC_TO, 236.8f, 32.1f, 244, 26.1f, 252.6f, 26.1f, LINE_TO, 267.62f, 24.94f,
H_LINE_TO, 253.8f, H_LINE_TO, 192.73f,
LINE_TO, 253.2f, 20.8f, H_LINE_TO, 100.12f,
H_LINE_TO, 182.2f, LINE_TO, 106.13f, 17.24f,
H_LINE_TO, 94.4f, H_LINE_TO, 182.08f,
LINE_TO, 100.1f, 13.5f, LINE_TO, 175.2f, -1,
H_LINE_TO, 172.1f, H_LINE_TO, 200.5f,
LINE_TO, 167.1f, 0, LINE_TO, 194.63f, 19.35f,
H_LINE_TO, 188.5f, H_LINE_TO, 266.99f,
LINE_TO, 184, 15.5f, LINE_TO, 266.36f, 13.86f,
H_LINE_TO, 252.6f, H_LINE_TO, 211.3f,
LINE_TO, 252, 10.3f, LINE_TO, 217, -1,
H_LINE_TO, 199.8f,
LINE_TO, 203.7f, 0,
CLOSE, CLOSE,
MOVE_TO, 68.2f, 0, MOVE_TO, 70.9f, -1,
H_LINE_TO, 4, H_LINE_TO, 0,
CUBIC_TO, 1.79f, 0, 0, 1.79f, 0, 4, V_LINE_TO, 80,
V_LINE_TO, 69, H_LINE_TO, 81.13f,
CUBIC_TO, 0, 71.21f, 1.79f, 73, 4, 73, CUBIC_TO, 79.02f, 76.1f, 77.76f, 71.67f, 77.76f, 66.92f,
LINE_TO, 4.5f, 73, CUBIC_TO, 77.76f, 52.15f, 89.78f, 40.13f, 104.55f, 40.13f,
LINE_TO, 13.8f, 47.7f, CUBIC_TO, 117.21f, 40.13f, 127.76f, 48.99f, 130.6f, 60.8f,
CUBIC_TO, 16.4f, 49.4f, 19.5f, 50.4f, 22.8f, 50.4f, CUBIC_TO, 135.03f, 58.9f, 141.05f, 58.17f, 147.48f, 60.91f,
CUBIC_TO, 31.3f, 50.4f, 38.3f, 43.8f, 38.9f, 35.5f, CUBIC_TO, 150.22f, 48.99f, 160.88f, 40.13f, 173.53f, 40.13f,
CUBIC_TO, 40.3f, 34.5f, 44, 32.7f, 48.5f, 35.6f, CUBIC_TO, 178.6f, 40.13f, 183.34f, 41.61f, 187.35f, 44.03f,
CUBIC_TO, 49.2f, 43.9f, 56.1f, 50.4f, 64.6f, 50.4f, LINE_TO, 190.73f, 32.53f,
CUBIC_TO, 67.5f, 50.4f, 70.2f, 49.7f, 72.6f, 48.3f, H_LINE_TO, 94.11f,
LINE_TO, 53, 73, LINE_TO, 85.04f, 43.93f,
H_LINE_TO, 76.4f, CUBIC_TO, 85.56f, 42.34f, 85.78f, 40.76f, 85.78f, 39.07f,
CUBIC_TO, 74.4f, 69.3f, 73.2f, 65.1f, 73.2f, 60.6f, CUBIC_TO, 85.78f, 29.69f, 78.08f, 21.99f, 68.69f, 21.99f,
CUBIC_TO, 73.2f, 46.6f, 84.6f, 35.2f, 98.6f, 35.2f, CUBIC_TO, 60.57f, 21.99f, 53.82f, 27.68f, 52.02f, 35.17f,
CUBIC_TO, 110.6f, 35.2f, 120.6f, 43.6f, 123.3f, 54.8f, CUBIC_TO, 47.91f, 33.48f, 44.11f, 33.91f, 41.26f, 35.17f,
CUBIC_TO, 127.5f, 53, 133.2f, 52.3f, 139.3f, 54.9f, CUBIC_TO, 39.58f, 28.32f, 33.88f, 23.04f, 26.81f, 22.09f,
CUBIC_TO, 141.9f, 43.6f, 152, 35.2f, 164, 35.2f, LINE_TO, 28.71f, 17.03f,
CUBIC_TO, 168.8f, 35.2f, 173.3f, 36.6f, 177.1f, 38.9f, H_LINE_TO, 90.73f,
LINE_TO, 180.3f, 28, V_LINE_TO, 12.18f,
H_LINE_TO, 88.7f, H_LINE_TO, 30.5f,
LINE_TO, 80.1f, 38.8f, LINE_TO, 32.3f, 7.32f,
CUBIC_TO, 80.6f, 37.3f, 80.8f, 35.8f, 80.8f, 34.2f, H_LINE_TO, 74.07f,
CUBIC_TO, 80.8f, 25.3f, 73.5f, 18, 64.6f, 18, LINE_TO, 70.9f, -1,
CUBIC_TO, 56.9f, 18, 50.5f, 23.4f, 48.8f, 30.5f,
CUBIC_TO, 44.9f, 28.9f, 41.3f, 29.3f, 38.6f, 30.5f,
CUBIC_TO, 37, 24, 31.6f, 19, 24.9f, 18.1f,
LINE_TO, 26.7f, 13.3f,
H_LINE_TO, 85.5f,
V_LINE_TO, 8.7f,
H_LINE_TO, 28.4f,
LINE_TO, 30.1f, 4.1f,
H_LINE_TO, 69.7f,
LINE_TO, 68.2f, 0,
CLOSE, CLOSE,
MOVE_TO, 85.3f, 73, MOVE_TO, 90.52f, 80,
H_LINE_TO, 111.7f, H_LINE_TO, 118.37f,
CUBIC_TO, 114.7f, 69.7f, 116.6f, 65.4f, 116.6f, 60.6f, CUBIC_TO, 121.53f, 76.52f, 123.54f, 71.98f, 123.54f, 66.92f,
CUBIC_TO, 116.6f, 50.6f, 108.5f, 42.5f, 98.5f, 42.5f, CUBIC_TO, 123.54f, 56.37f, 114.99f, 47.83f, 104.45f, 47.83f,
CUBIC_TO, 88.5f, 42.5f, 80.4f, 50.6f, 80.4f, 60.6f, CUBIC_TO, 93.9f, 47.83f, 85.35f, 56.37f, 85.35f, 66.92f,
CUBIC_TO, 80.4f, 65.4f, 82.3f, 69.8f, 85.3f, 73, CUBIC_TO, 85.35f, 71.98f, 87.36f, 76.62f, 90.52f, 80,
CLOSE, CLOSE,
MOVE_TO, 120.5f, 73, MOVE_TO, 127.65f, 80,
H_LINE_TO, 141.6f, H_LINE_TO, 149.91f,
CUBIC_TO, 139.9f, 69.9f, 138.8f, 66.5f, 138.5f, 62.8f, CUBIC_TO, 148.11f, 76.73f, 146.95f, 73.14f, 146.64f, 69.24f,
CUBIC_TO, 131.5f, 58.3f, 125.8f, 61.2f, 123.6f, 62.7f, CUBIC_TO, 139.25f, 64.49f, 133.24f, 67.55f, 130.92f, 69.14f,
CUBIC_TO, 123.3f, 66.4f, 122.2f, 69.9f, 120.5f, 73, CUBIC_TO, 130.6f, 73.04f, 129.44f, 76.73f, 127.65f, 80,
CLOSE, CLOSE,
MOVE_TO, 150.4f, 73, MOVE_TO, 159.19f, 80,
H_LINE_TO, 167.2f, H_LINE_TO, 176.91f,
LINE_TO, 174.6f, 46.2f, LINE_TO, 184.72f, 51.73f,
CUBIC_TO, 171.5f, 43.9f, 167.7f, 42.5f, 163.6f, 42.5f, CUBIC_TO, 181.45f, 49.31f, 177.44f, 47.83f, 173.11f, 47.83f,
CUBIC_TO, 153.6f, 42.5f, 145.5f, 50.6f, 145.5f, 60.6f, CUBIC_TO, 162.56f, 47.83f, 154.02f, 56.37f, 154.02f, 66.92f,
CUBIC_TO, 145.5f, 65.4f, 147.4f, 69.8f, 150.4f, 73, CUBIC_TO, 154.02f, 71.98f, 156.03f, 76.62f, 159.19f, 80,
CLOSE, CLOSE,
MOVE_TO, 76.2f, 34.2f, MOVE_TO, 80.92f, 39.07f,
CUBIC_TO, 76.2f, 40.61f, 71.01f, 45.8f, 64.6f, 45.8f, CUBIC_TO, 80.92f, 45.83f, 75.45f, 51.31f, 68.69f, 51.31f,
CUBIC_TO, 58.19f, 45.8f, 53, 40.61f, 53, 34.2f, CUBIC_TO, 61.93f, 51.31f, 56.45f, 45.83f, 56.45f, 39.07f,
CUBIC_TO, 53, 27.79f, 58.19f, 22.6f, 64.6f, 22.6f, CUBIC_TO, 56.45f, 32.32f, 61.93f, 26.84f, 68.69f, 26.84f,
CUBIC_TO, 71.01f, 22.6f, 76.2f, 27.79f, 76.2f, 34.2f, CUBIC_TO, 75.45f, 26.84f, 80.92f, 32.32f, 80.92f, 39.07f,
CLOSE, CLOSE,
MOVE_TO, 34.4f, 34.2f, MOVE_TO, 51.71f, 40.55f,
CUBIC_TO, 34.4f, 27.9f, 29.4f, 22.8f, 23.2f, 22.6f, CUBIC_TO, 46.96f, 37.49f, 43.06f, 39.39f, 41.58f, 40.45f,
LINE_TO, 15.5f, 43.2f, CUBIC_TO, 40.95f, 49.2f, 33.56f, 56.16f, 24.6f, 56.16f,
CUBIC_TO, 17.5f, 44.8f, 20, 45.8f, 22.8f, 45.8f, CUBIC_TO, 21.12f, 56.16f, 17.85f, 55.11f, 15.1f, 53.31f,
CUBIC_TO, 29.2f, 45.8f, 34.4f, 40.6f, 34.4f, 34.2f, LINE_TO, 5.29f, 80,
H_LINE_TO, 56.45f,
LINE_TO, 77.13f, 53.95f,
CUBIC_TO, 74.59f, 55.42f, 71.75f, 56.16f, 68.69f, 56.16f,
CUBIC_TO, 59.72f, 56.16f, 52.44f, 49.31f, 51.71f, 40.55f,
CLOSE, CLOSE,
MOVE_TO, 218.7f, 44.2f, MOVE_TO, 36.83f, 39.07f,
CUBIC_TO, 218.7f, 51.38f, 212.88f, 57.2f, 205.7f, 57.2f, CUBIC_TO, 36.83f, 32.43f, 31.56f, 27.05f, 25.02f, 26.84f,
CUBIC_TO, 198.52f, 57.2f, 192.7f, 51.38f, 192.7f, 44.2f, LINE_TO, 16.9f, 48.57f,
CUBIC_TO, 192.7f, 37.02f, 198.52f, 31.2f, 205.7f, 31.2f, CUBIC_TO, 19.01f, 50.25f, 21.64f, 51.31f, 24.6f, 51.31f,
CUBIC_TO, 212.88f, 31.2f, 218.7f, 37.02f, 218.7f, 44.2f, CUBIC_TO, 31.35f, 51.31f, 36.83f, 45.82f, 36.83f, 39.07f,
CLOSE, CLOSE,
MOVE_TO, 239.6f, 44.2f, MOVE_TO, 231.23f, 49.62f,
CUBIC_TO, 239.6f, 51.4f, 245.4f, 57.2f, 252.6f, 57.2f, CUBIC_TO, 231.23f, 57.2f, 225.09f, 63.33f, 217.52f, 63.33f,
CUBIC_TO, 254.3f, 57.2f, 255.9f, 56.9f, 257.4f, 56.3f, CUBIC_TO, 209.95f, 63.33f, 203.81f, 57.2f, 203.81f, 49.62f,
LINE_TO, 254.4f, 31.3f, CUBIC_TO, 203.81f, 42.05f, 209.95f, 35.91f, 217.52f, 35.91f,
CUBIC_TO, 253.8f, 31.2f, 253.2f, 31.2f, 252.5f, 31.2f, CUBIC_TO, 225.09f, 35.91f, 231.23f, 42.05f, 231.23f, 49.62f,
CUBIC_TO, 245.4f, 31.1f, 239.6f, 37, 239.6f, 44.2f, CLOSE,
CLOSE MOVE_TO, 253.28f, 49.62f,
\ No newline at end of file CUBIC_TO, 253.28f, 57.22f, 259.39f, 63.33f, 266.99f, 63.33f,
CUBIC_TO, 268.78f, 63.33f, 270.47f, 63.02f, 272.05f, 62.39f,
LINE_TO, 268.89f, 36.02f,
CUBIC_TO, 268.26f, 35.91f, 267.62f, 35.91f, 266.88f, 35.91f,
CUBIC_TO, 259.39f, 35.8f, 253.28f, 42.03f, 253.28f, 49.62f,
CLOSE
...@@ -63,10 +63,11 @@ constexpr int kBadgeSize = 16; ...@@ -63,10 +63,11 @@ constexpr int kBadgeSize = 16;
constexpr int kCircularImageButtonSize = 28; constexpr int kCircularImageButtonSize = 28;
// TODO(crbug.com/1128499): Remove this constant by extracting art height from // TODO(crbug.com/1128499): Remove this constant by extracting art height from
// |avatar_header_art|. // |avatar_header_art|.
constexpr int kHeaderArtHeight = 72; constexpr int kHeaderArtHeight = 80;
constexpr int kIdentityImageBorder = 2; constexpr int kIdentityImageBorder = 2;
constexpr int kIdentityImageSizeInclBorder = constexpr int kIdentityImageSizeInclBorder =
ProfileMenuViewBase::kIdentityImageSize + 2 * kIdentityImageBorder; ProfileMenuViewBase::kIdentityImageSize + 2 * kIdentityImageBorder;
constexpr int kHalfOfAvatarImageViewSize = kIdentityImageSizeInclBorder / 2;
// If the bubble is too large to fit on the screen, it still needs to be at // If the bubble is too large to fit on the screen, it still needs to be at
// least this tall to show one row. // least this tall to show one row.
...@@ -157,6 +158,7 @@ gfx::ImageSkia SizeImageModel(const ui::ImageModel& image_model, ...@@ -157,6 +158,7 @@ gfx::ImageSkia SizeImageModel(const ui::ImageModel& image_model,
.GetImageSkia(native_theme, size); .GetImageSkia(native_theme, size);
} }
// TODO(crbug.com/1146998): Adjust button size to be 16x16.
class CircularImageButton : public views::ImageButton { class CircularImageButton : public views::ImageButton {
public: public:
CircularImageButton(PressedCallback callback, CircularImageButton(PressedCallback callback,
...@@ -362,18 +364,14 @@ void BuildProfileBackgroundContainer( ...@@ -362,18 +364,14 @@ void BuildProfileBackgroundContainer(
views::View* parent, views::View* parent,
std::unique_ptr<views::View> heading_label, std::unique_ptr<views::View> heading_label,
base::Optional<SkColor> background_color, base::Optional<SkColor> background_color,
int corner_radius,
std::unique_ptr<views::View> avatar_image_view, std::unique_ptr<views::View> avatar_image_view,
std::unique_ptr<views::View> edit_button, std::unique_ptr<views::View> edit_button,
const ui::ThemedVectorIcon& avatar_header_art) { const ui::ThemedVectorIcon& avatar_header_art) {
constexpr int kExtraMarginInsideProfileBackground = 2;
views::View* profile_background_container = views::View* profile_background_container =
parent->AddChildView(std::make_unique<views::View>()); parent->AddChildView(std::make_unique<views::View>());
gfx::Insets background_container_insets( gfx::Insets background_container_insets(0, /*horizontal=*/kMenuEdgeMargin);
kExtraMarginInsideProfileBackground, kExtraMarginInsideProfileBackground,
/*bottom=*/0, kExtraMarginInsideProfileBackground);
if (edit_button) { if (edit_button) {
// Compensate for the edit button on the right with an extra margin on the // Compensate for the edit button on the right with an extra margin on the
// left so that the rest is centered. // left so that the rest is centered.
...@@ -383,17 +381,17 @@ void BuildProfileBackgroundContainer( ...@@ -383,17 +381,17 @@ void BuildProfileBackgroundContainer(
profile_background_container profile_background_container
->SetLayoutManager(std::make_unique<views::FlexLayout>()) ->SetLayoutManager(std::make_unique<views::FlexLayout>())
->SetOrientation(views::LayoutOrientation::kHorizontal) ->SetOrientation(views::LayoutOrientation::kHorizontal)
.SetCrossAxisAlignment(views::LayoutAlignment::kStart) .SetCrossAxisAlignment(views::LayoutAlignment::kEnd)
.SetInteriorMargin(background_container_insets); .SetInteriorMargin(background_container_insets);
if (background_color.has_value()) { if (background_color.has_value()) {
// The bottom background edge should match the center of the identity image. // The bottom background edge should match the center of the identity image.
gfx::Insets background_insets(0, 0, gfx::Insets background_insets(0, 0, /*bottom=*/kHalfOfAvatarImageViewSize,
/*bottom=*/kIdentityImageSizeInclBorder / 2,
0); 0);
// TODO(crbug.com/1147038): Remove the zero-radius rounded background.
profile_background_container->SetBackground( profile_background_container->SetBackground(
views::CreateBackgroundFromPainter( views::CreateBackgroundFromPainter(
views::Painter::CreateSolidRoundRectPainter( views::Painter::CreateSolidRoundRectPainter(
background_color.value(), corner_radius, background_insets))); background_color.value(), /*radius=*/0, background_insets)));
} else { } else {
profile_background_container->SetBackground( profile_background_container->SetBackground(
views::CreateThemedVectorIconBackground(profile_background_container, views::CreateThemedVectorIconBackground(profile_background_container,
...@@ -403,13 +401,9 @@ void BuildProfileBackgroundContainer( ...@@ -403,13 +401,9 @@ void BuildProfileBackgroundContainer(
// |avatar_margin| is derived from |avatar_header_art| asset height, it // |avatar_margin| is derived from |avatar_header_art| asset height, it
// increases margin for the avatar icon to make |avatar_header_art| visible // increases margin for the avatar icon to make |avatar_header_art| visible
// above the center of the avatar icon. // above the center of the avatar icon.
// Subtracting |kIdentityImageBorder| from the height as it isn't part of the const int avatar_margin = avatar_header_art.empty()
// actual image and shouldn't affect the margin. ? kMenuEdgeMargin
const int avatar_margin = : kHeaderArtHeight - kHalfOfAvatarImageViewSize;
avatar_header_art.empty()
? kDefaultMargin
: kHeaderArtHeight - kIdentityImageBorder -
ProfileMenuViewBase::kIdentityImageSize / 2;
// The |heading_and_image_container| is on the left and it stretches almost // The |heading_and_image_container| is on the left and it stretches almost
// the full width. It contains the profile heading and the avatar image. // the full width. It contains the profile heading and the avatar image.
...@@ -443,7 +437,15 @@ void BuildProfileBackgroundContainer( ...@@ -443,7 +437,15 @@ void BuildProfileBackgroundContainer(
views::FlexSpecification(views::MinimumFlexSizeRule::kPreferred, views::FlexSpecification(views::MinimumFlexSizeRule::kPreferred,
views::MaximumFlexSizeRule::kPreferred) views::MaximumFlexSizeRule::kPreferred)
.WithOrder(2)); .WithOrder(2));
profile_background_container->AddChildView(std::move(edit_button)); views::View* edit_button_container =
profile_background_container->AddChildView(
std::make_unique<views::View>());
edit_button_container->SetLayoutManager(CreateBoxLayout(
views::BoxLayout::Orientation::kVertical,
views::BoxLayout::CrossAxisAlignment::kCenter,
gfx::Insets(
0, 0, /*bottom=*/kHalfOfAvatarImageViewSize + kDefaultMargin, 0)));
edit_button_container->AddChildView(std::move(edit_button));
} }
} }
...@@ -521,7 +523,8 @@ ProfileMenuViewBase::ProfileMenuViewBase(views::Button* anchor_button, ...@@ -521,7 +523,8 @@ ProfileMenuViewBase::ProfileMenuViewBase(views::Button* anchor_button,
// TODO(tluk): Remove when fixing https://crbug.com/822075 // TODO(tluk): Remove when fixing https://crbug.com/822075
// The sign in webview will be clipped on the bottom corners without these // The sign in webview will be clipped on the bottom corners without these
// margins, see related bug <http://crbug.com/593203>. // margins, see related bug <http://crbug.com/593203>.
set_margins(gfx::Insets(2, 0)); SetPaintClientToLayer(true);
set_margins(gfx::Insets(0));
DCHECK(anchor_button); DCHECK(anchor_button);
anchor_button->AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr); anchor_button->AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
...@@ -555,10 +558,10 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( ...@@ -555,10 +558,10 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
base::FeatureList::IsEnabled(features::kNewProfilePicker); base::FeatureList::IsEnabled(features::kNewProfilePicker);
identity_info_container_->RemoveAllChildViews(/*delete_children=*/true); identity_info_container_->RemoveAllChildViews(/*delete_children=*/true);
// In the new design, the colored background must only have|kDefaultMargin| // In the new design, the colored background fully bleeds to the edges of the
// margins so this container cannot have larger margins. In this case, further // menu and to achieve that |container_margin| is set to 0. In this case,
// margins will be added by children views. // further margins will be added by children views.
const int container_margin = new_design ? kDefaultMargin : kMenuEdgeMargin; const int container_margin = new_design ? 0 : kMenuEdgeMargin;
identity_info_container_->SetLayoutManager( identity_info_container_->SetLayoutManager(
CreateBoxLayout(views::BoxLayout::Orientation::kVertical, CreateBoxLayout(views::BoxLayout::Orientation::kVertical,
views::BoxLayout::CrossAxisAlignment::kStretch, views::BoxLayout::CrossAxisAlignment::kStretch,
...@@ -642,7 +645,6 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( ...@@ -642,7 +645,6 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
BuildProfileBackgroundContainer( BuildProfileBackgroundContainer(
/*parent=*/identity_info_container_, std::move(heading_label), /*parent=*/identity_info_container_, std::move(heading_label),
background_color, background_color,
GetCornerRadius(), // Use the same radius as the bubble has.
std::move(avatar_image_view), std::move(edit_button), avatar_header_art); std::move(avatar_image_view), std::move(edit_button), avatar_header_art);
BuildProfileTitleAndSubtitle(/*parent=*/identity_info_container_, title, BuildProfileTitleAndSubtitle(/*parent=*/identity_info_container_, title,
subtitle); subtitle);
......
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