ash/system/tray/system_tray.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/tray/system_tray.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/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index daddcb370d4ccfeeb134e0b6334d96eac3ee96b2..267f2a657cd6bf3dc6089cd2c9b329d978e1a47d 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

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

#if defined(OS_CHROMEOS)

#include "ash/common/system/chromeos/power/power_status.h"

#include "ash/common/system/chromeos/power/tray_power.h"

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

#include "ash/common/system/chromeos/settings/tray_settings.h"

#include "ash/common/system/chromeos/tray_tracing.h"

#include "ash/common/system/ime/tray_ime_chromeos.h"

@@ -61,7 +62,6 @@

#include "ash/system/chromeos/rotation/tray_rotation_lock.h"

#include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"

#include "ash/system/chromeos/screen_security/screen_share_tray_item.h"

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

#include "ash/system/chromeos/supervised/tray_supervised_user.h"

#include "ash/system/chromeos/tray_caps_lock.h"

#include "ash/system/chromeos/tray_display.h"

« ash/shell.cc ('K') | « ash/system/status_area_widget.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »