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

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

« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.cc ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a7cca7fe61f72a1cec8912dfa84e9d03149fd0bc..70525757f7468e381850871b82c61d7bb3437499 100644

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

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

@@ -6,7 +6,7 @@

#define ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_

#include "ash/common/keyboard/keyboard_ui_observer.h"

-#include "ash/system/tray/tray_background_view.h"

+#include "ash/common/system/tray/tray_background_view.h"

#include "ash/system/user/login_status.h"

#include "base/macros.h"

#include "ui/views/controls/button/button.h"

« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.cc ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »