Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Unified Diff: ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nits Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
diff --git a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
index 205af0425d2cad495d9095c1144ea94d2d697fff..417a63b7b75e673ca5aa1a6d0d02ce3272eefc79 100644
--- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
+++ b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
@@ -100,8 +100,8 @@ void VirtualKeyboardTray::OnKeyboardBoundsChanging(
void VirtualKeyboardTray::SetIconBorderForShelfAlignment() {
// Every time shelf alignment is updated, StatusAreaWidgetDelegate resets the
// border to a non-null border. So, we need to remove it.
- tray_container()->SetBorder(views::Border::NullBorder());
-
+ if (!ash::MaterialDesignController::IsShelfMaterial())
+ tray_container()->SetBorder(views::Border::NullBorder());
const gfx::ImageSkia& image = icon_->GetImage();
const int size = GetTrayConstant(VIRTUAL_KEYBOARD_BUTTON_SIZE);
const int vertical_padding = (size - image.height()) / 2;
« no previous file with comments | « ash/common/system/chromeos/session/logout_button_tray.cc ('k') | ash/common/system/overview/overview_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698