Commit 7488f368 authored by Zakhar Voit's avatar Zakhar Voit Committed by Commit Bot

Remove red warning icon from public session login page

This is a temporary change until we support managed
sessions properly and can show the UI based on
whether we run public session or managed session.

Bug: 905317
Change-Id: I03c15f2d0bc59ed9a86d4da86aa62590721366eb
Reviewed-on: https://chromium-review.googlesource.com/c/1335584Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Reviewed-by: default avatarIvan Šandrk <isandrk@chromium.org>
Commit-Queue: Zakhar Voit <voit@google.com>
Cr-Commit-Position: refs/heads/master@{#608088}
parent b44653f9
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "ash/shell.h" #include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h" #include "ash/strings/grit/ash_strings.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "components/vector_icons/vector_icons.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/paint_vector_icon.h"
...@@ -75,7 +74,6 @@ constexpr int kNonEmptyHeight = 1; ...@@ -75,7 +74,6 @@ constexpr int kNonEmptyHeight = 1;
constexpr char kMonitoringWarningClassName[] = "MonitoringWarning"; constexpr char kMonitoringWarningClassName[] = "MonitoringWarning";
constexpr int kSpacingBetweenMonitoringWarningIconAndLabelDp = 8; constexpr int kSpacingBetweenMonitoringWarningIconAndLabelDp = 8;
constexpr int kMonitoringWarningIconSizeDp = 20;
views::Label* CreateLabel(const base::string16& text, SkColor color) { views::Label* CreateLabel(const base::string16& text, SkColor color) {
auto* label = new views::Label(text); auto* label = new views::Label(text);
...@@ -181,8 +179,7 @@ class SelectionButtonView : public LoginButton { ...@@ -181,8 +179,7 @@ class SelectionButtonView : public LoginButton {
DISALLOW_COPY_AND_ASSIGN(SelectionButtonView); DISALLOW_COPY_AND_ASSIGN(SelectionButtonView);
}; };
// Container for the device monitoring warning. Contains the warning icon on // Container for the device monitoring warning.
// the left side, and text on the right side.
class MonitoringWarningView : public NonAccessibleView { class MonitoringWarningView : public NonAccessibleView {
public: public:
MonitoringWarningView() : NonAccessibleView(kMonitoringWarningClassName) { MonitoringWarningView() : NonAccessibleView(kMonitoringWarningClassName) {
...@@ -190,13 +187,6 @@ class MonitoringWarningView : public NonAccessibleView { ...@@ -190,13 +187,6 @@ class MonitoringWarningView : public NonAccessibleView {
views::BoxLayout::kHorizontal, gfx::Insets(), views::BoxLayout::kHorizontal, gfx::Insets(),
kSpacingBetweenMonitoringWarningIconAndLabelDp)); kSpacingBetweenMonitoringWarningIconAndLabelDp));
views::ImageView* image = new views::ImageView();
image->SetImage(gfx::CreateVectorIcon(
vector_icons::kWarningIcon, kMonitoringWarningIconSizeDp, SK_ColorRED));
image->SetPreferredSize(
gfx::Size(kMonitoringWarningIconSizeDp, kMonitoringWarningIconSizeDp));
AddChildView(image);
const base::string16 label_text = l10n_util::GetStringUTF16( const base::string16 label_text = l10n_util::GetStringUTF16(
IDS_ASH_LOGIN_PUBLIC_ACCOUNT_MONITORING_WARNING); IDS_ASH_LOGIN_PUBLIC_ACCOUNT_MONITORING_WARNING);
views::Label* label = CreateLabel(label_text, SK_ColorWHITE); views::Label* label = CreateLabel(label_text, SK_ColorWHITE);
......
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