ash/system/status_area_widget.cc - Issue 2108793002: mash: Convert system tray logout button 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/status_area_widget.cc

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ifdefs 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/status_area_widget.cc

diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc

index fe2836ec34493a51c74a30a4e249a8aec4427fcf..43b53794eb3c74aa165b0cd021b403328f10aa3a 100644

--- a/ash/system/status_area_widget.cc

+++ b/ash/system/status_area_widget.cc

@@ -18,7 +18,7 @@

#include "base/i18n/time_formatting.h"

#if defined(OS_CHROMEOS)

-#include "ash/system/chromeos/session/logout_button_tray.h"

+#include "ash/common/system/chromeos/session/logout_button_tray.h"

#include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"

#endif

« ash/shell.cc ('K') | « ash/system/chromeos/supervised/tray_supervised_user.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »