ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

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/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict 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

Index: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

index 43ff5aeedd0b7061e6d79e74eff99b07f510013b..b70e990d7c0a3b910422ed33ddf6491a1c2ef42d 100644

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

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

@@ -28,8 +28,7 @@

namespace ash {

VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)

- : TrayBackgroundView(status_area_widget),

- button_(NULL) {

+ : TrayBackgroundView(status_area_widget->wm_shelf()), button_(nullptr) {

button_ = new views::ImageButton(this);

if (MaterialDesignController::IsShelfMaterial()) {

gfx::ImageSkia image_md =

« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/system/overview/overview_button_tray.h » ('j') | no next file with comments »