ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc - Issue 2103113003: Fix shelf layout when switching from left-aligned shelf to right-aligned shelf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2103113003: Fix shelf layout when switching from left-aligned shelf to right-aligned shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge Created 4 years, 6 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

« no previous file with comments | « ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/common/system/tray/tray_background_view.h » ('j') | ash/common/system/tray/tray_background_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5e2391ff8370638d3d2e99f623ed125764b3276c..0bac40daace20a5b6cf51e20bb58430c990e7ee9 100644

--- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

+++ b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

@@ -55,8 +55,9 @@ VirtualKeyboardTray::~VirtualKeyboardTray() {

WmShell::Get()->keyboard_ui()->RemoveObserver(this);

}

-void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {

- TrayBackgroundView::SetShelfAlignment(alignment);

+void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment,

+ const gfx::Insets& insets) {

+ TrayBackgroundView::SetShelfAlignment(alignment, insets);

tray_container()->SetBorder(views::Border::NullBorder());

// Pad button size to align with other controls in the system tray.