Replace cookie controls icon

Replace shield with an eye.

https://screenshot.googleplex.com/MMf2t0rPZ0b.png

Bug: 967668
Change-Id: Ic128c96254f4ffe6796f1122e99d12bf753e34d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863012Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705959}

chrome/app/vector_icons/BUILD.gn

@@ -91,9 +91,9 @@ aggregate_vector_icons("chrome_vector_icons") {
     "save_original_file.icon",
     "security.icon",
     "send_tab_to_self.icon",
-    "shield_dot.icon",
-    "shield_off.icon",
-    "shield_outline.icon",
+    "eye_crossed.icon",
+    "eye_crossed_dot.icon",
+    "eye.icon",
     "sensors.icon",
     "signin_button_drop_down_arrow.icon",
     "sign_out.icon",

chrome/app/vector_icons/eye.icon

+// Copyright 2019 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, 16,
+MOVE_TO, 8, 5.67f,
+CUBIC_TO, 7.47f, 5.67f, 6.96f, 5.88f, 6.59f, 6.25f,
+CUBIC_TO, 6.21f, 6.63f, 6, 7.14f, 6, 7.67f,
+CUBIC_TO, 6, 8.2f, 6.21f, 8.71f, 6.59f, 9.08f,
+CUBIC_TO, 6.96f, 9.46f, 7.47f, 9.67f, 8, 9.67f,
+CUBIC_TO, 8.53f, 9.67f, 9.04f, 9.46f, 9.41f, 9.08f,
+CUBIC_TO, 9.79f, 8.71f, 10, 8.2f, 10, 7.67f,
+CUBIC_TO, 10, 7.14f, 9.79f, 6.63f, 9.41f, 6.25f,
+CUBIC_TO, 9.04f, 5.88f, 8.53f, 5.67f, 8, 5.67f,
+CLOSE,
+MOVE_TO, 8, 11,
+CUBIC_TO, 7.12f, 11, 6.27f, 10.65f, 5.64f, 10.02f,
+CUBIC_TO, 5.02f, 9.4f, 4.67f, 8.55f, 4.67f, 7.67f,
+CUBIC_TO, 4.67f, 6.78f, 5.02f, 5.93f, 5.64f, 5.31f,
+CUBIC_TO, 6.27f, 4.68f, 7.12f, 4.33f, 8, 4.33f,
+CUBIC_TO, 8.88f, 4.33f, 9.73f, 4.68f, 10.36f, 5.31f,
+CUBIC_TO, 10.98f, 5.93f, 11.33f, 6.78f, 11.33f, 7.67f,
+CUBIC_TO, 11.33f, 8.55f, 10.98f, 9.4f, 10.36f, 10.02f,
+CUBIC_TO, 9.73f, 10.65f, 8.88f, 11, 8, 11,
+V_LINE_TO, 11,
+CLOSE,
+MOVE_TO, 8, 2.67f,
+CUBIC_TO, 4.67f, 2.67f, 1.82f, 4.74f, 0.67f, 7.67f,
+CUBIC_TO, 1.82f, 10.59f, 4.67f, 12.67f, 8, 12.67f,
+CUBIC_TO, 11.33f, 12.67f, 14.18f, 10.59f, 15.33f, 7.67f,
+CUBIC_TO, 14.18f, 4.74f, 11.33f, 2.67f, 8, 2.67f,
+CLOSE

chrome/app/vector_icons/eye_crossed.icon

+// Copyright 2019 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, 16,
+MOVE_TO, 2.53f, 1.47f,
+LINE_TO, 14.53f, 13.47f,
+LINE_TO, 13.47f, 14.53f,
+LINE_TO, 11.01f, 12.07f,
+CUBIC_TO, 10.08f, 12.45f, 9.07f, 12.67f, 8, 12.67f,
+CUBIC_TO, 4.67f, 12.67f, 1.82f, 10.59f, 0.67f, 7.67f,
+CUBIC_TO, 1.2f, 6.32f, 2.09f, 5.15f, 3.22f, 4.28f,
+LINE_TO, 1.47f, 2.53f,
+LINE_TO, 2.53f, 1.47f,
+CLOSE,
+MOVE_TO, 5.05f, 6.11f,
+CUBIC_TO, 4.8f, 6.59f, 4.67f, 7.12f, 4.67f, 7.67f,
+CUBIC_TO, 4.67f, 8.55f, 5.02f, 9.4f, 5.64f, 10.02f,
+CUBIC_TO, 6.27f, 10.65f, 7.12f, 11, 8, 11,
+CUBIC_TO, 8.55f, 11, 9.08f, 10.87f, 9.55f, 10.62f,
+LINE_TO, 8.53f, 9.59f,
+CUBIC_TO, 8.36f, 9.64f, 8.18f, 9.67f, 8, 9.67f,
+CUBIC_TO, 7.47f, 9.67f, 6.96f, 9.46f, 6.59f, 9.08f,
+CUBIC_TO, 6.21f, 8.71f, 6, 8.2f, 6, 7.67f,
+CUBIC_TO, 6, 7.48f, 6.02f, 7.31f, 6.07f, 7.13f,
+LINE_TO, 5.05f, 6.11f,
+CLOSE,
+MOVE_TO, 7.44f, 4.38f,
+LINE_TO, 5.99f, 2.93f,
+CUBIC_TO, 6.63f, 2.76f, 7.3f, 2.67f, 8, 2.67f,
+CUBIC_TO, 11.33f, 2.67f, 14.18f, 4.74f, 15.33f, 7.67f,
+CUBIC_TO, 14.92f, 8.72f, 14.29f, 9.66f, 13.49f, 10.43f,
+LINE_TO, 11.29f, 8.23f,
+CUBIC_TO, 11.32f, 8.04f, 11.33f, 7.86f, 11.33f, 7.67f,
+CUBIC_TO, 11.33f, 6.78f, 10.98f, 5.93f, 10.36f, 5.31f,
+CUBIC_TO, 9.73f, 4.68f, 8.88f, 4.33f, 8, 4.33f,
+CUBIC_TO, 7.81f, 4.33f, 7.62f, 4.35f, 7.44f, 4.38f,
+CLOSE

chrome/app/vector_icons/eye_crossed_dot.icon

+// Copyright 2019 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, 16,
+MOVE_TO, 13.93f, 5.37f,
+CUBIC_TO, 13.55f, 5.55f, 13.12f, 5.65f, 12.67f, 5.65f,
+CUBIC_TO, 11.08f, 5.65f, 9.78f, 4.41f, 9.67f, 2.85f,
+CUBIC_TO, 9.13f, 2.73f, 8.57f, 2.67f, 8, 2.67f,
+CUBIC_TO, 7.3f, 2.67f, 6.63f, 2.76f, 5.99f, 2.93f,
+LINE_TO, 7.44f, 4.38f,
+CUBIC_TO, 7.62f, 4.35f, 7.81f, 4.34f, 8, 4.34f,
+CUBIC_TO, 8.88f, 4.34f, 9.73f, 4.69f, 10.36f, 5.31f,
+CUBIC_TO, 10.98f, 5.94f, 11.33f, 6.79f, 11.33f, 7.67f,
+CUBIC_TO, 11.33f, 7.86f, 11.32f, 8.05f, 11.29f, 8.23f,
+LINE_TO, 13.49f, 10.44f,
+CUBIC_TO, 14.29f, 9.66f, 14.92f, 8.72f, 15.33f, 7.67f,
+CUBIC_TO, 15, 6.82f, 14.52f, 6.05f, 13.93f, 5.37f,
+CLOSE,
+MOVE_TO, 2.53f, 1.47f,
+LINE_TO, 1.47f, 2.53f,
+LINE_TO, 3.22f, 4.29f,
+CUBIC_TO, 2.09f, 5.15f, 1.2f, 6.32f, 0.67f, 7.67f,
+CUBIC_TO, 1.82f, 10.6f, 4.67f, 12.67f, 8, 12.67f,
+CUBIC_TO, 9.07f, 12.67f, 10.08f, 12.46f, 11.01f, 12.07f,
+LINE_TO, 13.47f, 14.53f,
+LINE_TO, 14.53f, 13.47f,
+LINE_TO, 2.53f, 1.47f,
+CLOSE,
+MOVE_TO, 4.67f, 7.67f,
+CUBIC_TO, 4.67f, 7.12f, 4.8f, 6.59f, 5.05f, 6.12f,
+LINE_TO, 6.07f, 7.14f,
+CUBIC_TO, 6.02f, 7.31f, 6, 7.49f, 6, 7.67f,
+CUBIC_TO, 6, 8.2f, 6.21f, 8.71f, 6.59f, 9.08f,
+CUBIC_TO, 6.96f, 9.46f, 7.47f, 9.67f, 8, 9.67f,
+CUBIC_TO, 8.18f, 9.67f, 8.36f, 9.65f, 8.53f, 9.6f,
+LINE_TO, 9.55f, 10.62f,
+CUBIC_TO, 9.08f, 10.87f, 8.55f, 11, 8, 11,
+CUBIC_TO, 7.12f, 11, 6.27f, 10.65f, 5.64f, 10.03f,
+CUBIC_TO, 5.02f, 9.4f, 4.67f, 8.55f, 4.67f, 7.67f,
+CLOSE,
+NEW_PATH,
+PATH_COLOR_ARGB, 0xFF, 0x1A, 0x73, 0xE8,
+MOVE_TO, 12.67f, 4.65f,
+CUBIC_TO, 13.77f, 4.65f, 14.67f, 3.75f, 14.67f, 2.65f,
+CUBIC_TO, 14.67f, 1.55f, 13.77f, 0.65f, 12.67f, 0.65f,
+CUBIC_TO, 11.56f, 0.65f, 10.67f, 1.55f, 10.67f, 2.65f,
+CUBIC_TO, 10.67f, 3.75f, 11.56f, 4.65f, 12.67f, 4.65f,
+CLOSE

chrome/app/vector_icons/shield_dot.icon

-// Copyright 2019 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, 16,
-MOVE_TO, 14, 6.24f,
-LINE_TO, 14, 7.36f,
-CUBIC_TO, 14, 10.9f, 11.44f, 14.2f, 8, 15,
-CUBIC_TO, 4.56f, 14.2f, 2, 10.9f, 2, 7.36f,
-LINE_TO, 2, 3.55f,
-LINE_TO, 8, 1,
-LINE_TO, 9.94f, 1.82f,
-CUBIC_TO, 9.62f, 2.12f, 9.37f, 2.49f, 9.21f, 2.91f,
-LINE_TO, 8, 2.39f,
-LINE_TO, 3.33f, 4.37f,
-LINE_TO, 3.33f, 7.36f,
-CUBIC_TO, 3.33f, 10.24f, 5.32f, 12.89f, 8, 13.68f,
-CUBIC_TO, 10.68f, 12.89f, 12.67f, 10.24f, 12.67f, 7.36f,
-LINE_TO, 12.67f, 6.93f,
-CUBIC_TO, 13.17f, 6.81f, 13.63f, 6.57f, 14, 6.24f,
-CLOSE,
-NEW_PATH,
-PATH_COLOR_ARGB, 0xFF, 0x1A, 0x73, 0xE8,
-MOVE_TO, 12, 6,
-CUBIC_TO, 10.9f, 6, 10, 5.1f, 10, 4,
-CUBIC_TO, 10, 2.9f, 10.9f, 2, 12, 2,
-CUBIC_TO, 13.1f, 2, 14, 2.9f, 14, 4,
-CUBIC_TO, 14, 5.1f, 13.1f, 6, 12, 6,
-CLOSE

chrome/app/vector_icons/shield_off.icon

-// Copyright 2019 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, 16,
-MOVE_TO, 11.51f, 13.07f,
-CUBIC_TO, 10.54f, 14, 9.33f, 14.69f, 8, 15,
-CUBIC_TO, 4.56f, 14.2f, 2, 10.9f, 2, 7.36f,
-LINE_TO, 2, 3.56f,
-LINE_TO, 1.1f, 2.66f,
-LINE_TO, 2.16f, 1.6f,
-LINE_TO, 14.18f, 13.62f,
-LINE_TO, 13.12f, 14.68f,
-LINE_TO, 11.51f, 13.07f,
-CLOSE,
-MOVE_TO, 3.33f, 4.89f,
-LINE_TO, 3.33f, 7.36f,
-CUBIC_TO, 3.33f, 10.24f, 5.32f, 12.89f, 8, 13.68f,
-CUBIC_TO, 8.98f, 13.39f, 9.86f, 12.86f, 10.59f, 12.15f,
-LINE_TO, 3.33f, 4.89f,
-CLOSE,
-MOVE_TO, 13.29f, 10.57f,
-LINE_TO, 12.28f, 9.56f,
-CUBIC_TO, 12.53f, 8.86f, 12.67f, 8.12f, 12.67f, 7.36f,
-LINE_TO, 12.67f, 4.37f,
-LINE_TO, 8, 2.39f,
-LINE_TO, 5.97f, 3.25f,
-LINE_TO, 5, 2.27f,
-LINE_TO, 8, 1,
-LINE_TO, 14, 3.55f,
-LINE_TO, 14, 7.36f,
-CUBIC_TO, 14, 8.48f, 13.75f, 9.57f, 13.29f, 10.57f,
-CLOSE

chrome/app/vector_icons/shield_outline.icon

-// Copyright 2019 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, 16,
-MOVE_TO, 8, 0.67f,
-LINE_TO, 2, 3.33f,
-R_V_LINE_TO, 4,
-R_CUBIC_TO, 0, 3.7f, 2.56f, 7.16f, 6, 8,
-R_CUBIC_TO, 3.44f, -0.84f, 6, -4.3f, 6, -8,
-R_V_LINE_TO, -4,
-LINE_TO, 8, 0.67f,
-CLOSE,
-R_MOVE_TO, 4.67f, 6.67f,
-R_CUBIC_TO, 0, 3.01f, -1.99f, 5.79f, -4.67f, 6.62f,
-R_CUBIC_TO, -2.68f, -0.83f, -4.67f, -3.61f, -4.67f, -6.62f,
-V_LINE_TO, 4.2f,
-LINE_TO, 8, 2.13f,
-LINE_TO, 12.67f, 4.2f,
-R_V_LINE_TO, 3.13f,
-CLOSE
\ No newline at end of file

chrome/browser/ui/views/location_bar/cookie_controls_icon_view.cc

@@ -96,8 +96,8 @@ views::BubbleDialogDelegateView* CookieControlsIconView::GetBubble() const {
 
 const gfx::VectorIcon& CookieControlsIconView::GetVectorIcon() const {
   if (status_ == CookieControlsController::Status::kDisabledForSite)
-    return kShieldOffIcon;
-  return has_blocked_cookies_ ? kShieldDotIcon : kShieldOutlineIcon;
+    return kEyeIcon;
+  return has_blocked_cookies_ ? kEyeCrossedDotIcon : kEyeCrossedIcon;
 }
 
 base::string16 CookieControlsIconView::GetTextForTooltipAndAccessibleName()