Remove pre-MD cros tray logout button assets and code.
BUG=686296
Review-Url: https://codereview.chromium.org/2680223002
Cr-Commit-Position: refs/heads/master@{#448865}
diff --git a/ash/common/system/chromeos/session/logout_button_tray.cc b/ash/common/system/chromeos/session/logout_button_tray.cc
index d86f6aa..8e8fafa 100644
--- a/ash/common/system/chromeos/session/logout_button_tray.cc
+++ b/ash/common/system/chromeos/session/logout_button_tray.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <utility>
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
#include "ash/common/system/tray/system_tray_controller.h"
@@ -33,99 +32,26 @@
#include "ui/views/painter.h"
namespace ash {
-namespace {
-
-const int kLogoutButtonHorizontalExtraPadding = 7;
-
-const int kLogoutButtonNormalImages[] = {
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT};
-
-const int kLogoutButtonPushedImages[] = {
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT};
-
-// TODO(estade): LogoutButton is not used in MD; remove it when possible.
-// See crbug.com/614453
-class LogoutButton : public views::LabelButton {
- public:
- LogoutButton(views::ButtonListener* listener);
- ~LogoutButton() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LogoutButton);
-};
-
-} // namespace
-
-LogoutButton::LogoutButton(views::ButtonListener* listener)
- : views::LabelButton(listener, base::string16()) {
- SetupLabelForTray(label());
- SetFontList(label()->font_list());
- SetEnabledTextColors(SK_ColorWHITE);
-
- std::unique_ptr<views::LabelButtonAssetBorder> border(
- new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON));
- border->SetPainter(
- false, views::Button::STATE_NORMAL,
- views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
- border->SetPainter(
- false, views::Button::STATE_HOVERED,
- views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
- border->SetPainter(
- false, views::Button::STATE_PRESSED,
- views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
- gfx::Insets insets = border->GetInsets();
- insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding, 0,
- kLogoutButtonHorizontalExtraPadding);
- border->set_insets(insets);
- SetBorder(std::move(border));
- set_animate_on_state_change(false);
-
- SetMinSize(gfx::Size(0, GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY)));
-}
-
-LogoutButton::~LogoutButton() {}
LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
: TrayBackgroundView(wm_shelf),
button_(nullptr),
login_status_(LoginStatus::NOT_LOGGED_IN),
show_logout_button_in_tray_(false) {
- if (MaterialDesignController::IsShelfMaterial()) {
- views::MdTextButton* button =
- views::MdTextButton::Create(this, base::string16());
- button->SetProminent(true);
- button->SetBgColorOverride(gfx::kGoogleRed700);
- // Base font size + 2 = 14.
- // TODO(estade): should this 2 be shared with other tray views? See
- // crbug.com/623987
- button->AdjustFontSize(2);
- button_ = button;
+ views::MdTextButton* button =
+ views::MdTextButton::Create(this, base::string16());
+ button->SetProminent(true);
+ button->SetBgColorOverride(gfx::kGoogleRed700);
+ // Base font size + 2 = 14.
+ // TODO(estade): should this 2 be shared with other tray views? See
+ // crbug.com/623987
+ button->AdjustFontSize(2);
+ button_ = button;
- // Since |logout_button_tray| has a red background and it is distinguished
- // by itself, no separator is needed on its right side.
- set_separator_visibility(false);
- } else {
- button_ = new LogoutButton(this);
- }
+ // Since |logout_button_tray| has a red background and it is distinguished
+ // by itself, no separator is needed on its right side.
+ set_separator_visibility(false);
tray_container()->AddChildView(button_);
- if (!MaterialDesignController::IsShelfMaterial())
- tray_container()->SetBorder(views::NullBorder());
WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
}
@@ -138,8 +64,6 @@
// TrayBackgroundView::SetShelfAlignment() can lay it out correctly.
UpdateButtonTextAndImage(login_status_, alignment);
TrayBackgroundView::SetShelfAlignment(alignment);
- if (!MaterialDesignController::IsShelfMaterial())
- tray_container()->SetBorder(views::NullBorder());
}
base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
@@ -191,19 +115,16 @@
login_status_ = login_status;
const base::string16 title =
user::GetLocalizedSignOutStringForStatus(login_status, false);
- const int button_size = MaterialDesignController::IsShelfMaterial()
- ? kTrayItemSize
- : GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY);
if (IsHorizontalAlignment(alignment)) {
button_->SetText(title);
button_->SetImage(views::LabelButton::STATE_NORMAL, gfx::ImageSkia());
- button_->SetMinSize(gfx::Size(0, button_size));
+ button_->SetMinSize(gfx::Size(0, kTrayItemSize));
} else {
button_->SetText(base::string16());
button_->SetAccessibleName(title);
button_->SetImage(views::LabelButton::STATE_NORMAL,
gfx::CreateVectorIcon(kShelfLogoutIcon, kTrayIconColor));
- button_->SetMinSize(gfx::Size(button_size, button_size));
+ button_->SetMinSize(gfx::Size(kTrayItemSize, kTrayItemSize));
}
UpdateVisibility();
}
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 4008ede..57df993 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -164,24 +164,6 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="cros/network/status_cellular_enabled_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CHILD_USER" file="cros/status/status_child_user.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE" file="cros/status/status_managed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM" file="cros/status/status_logout_button_normal_bottom.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT" file="cros/status/status_logout_button_normal_bottom_left.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT" file="cros/status/status_logout_button_normal_bottom_right.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER" file="cros/status/status_logout_button_normal_center.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT" file="cros/status/status_logout_button_normal_left.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT" file="cros/status/status_logout_button_normal_right.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP" file="cros/status/status_logout_button_normal_top.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT" file="cros/status/status_logout_button_normal_top_left.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT" file="cros/status/status_logout_button_normal_top_right.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM" file="cros/status/status_logout_button_pushed_bottom.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT" file="cros/status/status_logout_button_pushed_bottom_left.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT" file="cros/status/status_logout_button_pushed_bottom_right.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER" file="cros/status/status_logout_button_pushed_center.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT" file="cros/status/status_logout_button_pushed_left.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT" file="cros/status/status_logout_button_pushed_right.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP" file="cros/status/status_logout_button_pushed_top.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT" file="cros/status/status_logout_button_pushed_top_left.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT" file="cros/status/status_logout_button_pushed_top_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SUPERVISED_USER" file="cros/status/status_managed_mode_user.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="cros/network/status_network_info.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="cros/network/status_network_info_hover.png" />
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png
deleted file mode 100644
index ec3dd966..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png
deleted file mode 100644
index 0dcfba3..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png
deleted file mode 100644
index ae9f85dc..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png
deleted file mode 100644
index 2db34550..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png
deleted file mode 100644
index a81413a..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png
deleted file mode 100644
index a23584b..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png
deleted file mode 100644
index 398908a0..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png
deleted file mode 100644
index 29cccfdb..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png b/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png
deleted file mode 100644
index 6a49c25..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png
deleted file mode 100644
index 4bbc45e..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png
deleted file mode 100644
index b270911..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png
deleted file mode 100644
index 615270b..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png
deleted file mode 100644
index 0e49074f..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png
deleted file mode 100644
index f2e9d48e..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png
deleted file mode 100644
index 7801a78..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png
deleted file mode 100644
index 41eaeb0..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png
deleted file mode 100644
index 45e5e93..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png b/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png
deleted file mode 100644
index 7dccf38..0000000
--- a/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png
deleted file mode 100644
index 84220a8..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png
deleted file mode 100644
index 1915157..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png
deleted file mode 100644
index 149b4a9..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png
deleted file mode 100644
index 04ebd60..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png
deleted file mode 100644
index 706caf6..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png
deleted file mode 100644
index aab4b068..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png
deleted file mode 100644
index b813452..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png
deleted file mode 100644
index 5480869..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png b/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png
deleted file mode 100644
index bf15dcd..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png
deleted file mode 100644
index eaf9725..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png
deleted file mode 100644
index 79f2792..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png
deleted file mode 100644
index d6aa1a4..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png
deleted file mode 100644
index 90845f6..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png
deleted file mode 100644
index cb5a7bbe..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png
deleted file mode 100644
index ce67a6c..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png
deleted file mode 100644
index adbde7a4..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png
deleted file mode 100644
index 14fd3a9..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png
+++ /dev/null
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png b/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png
deleted file mode 100644
index 5d5f634..0000000
--- a/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png
+++ /dev/null
Binary files differ