ash/common/system/tray/system_tray.cc - Issue 2776973005: Revert of Remove some pre-md code and assets.

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

Issue 2776973005: Revert of Remove some pre-md code and assets. (Closed)

Patch Set: Created 3 years, 9 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:

Index: ash/common/system/tray/system_tray.cc

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

index ebab05b3cc8939ebfd1717588d18b4044ea21501..4c6405eb58a4c0adbbb785e7d99ed34ebb27bfce 100644

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

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

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

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

#include "ash/common/system/chromeos/screen_security/screen_share_tray_item.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/supervised/tray_supervised_user.h"

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

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

@@ -308,6 +309,8 @@

delegate->CreateRotationLockTrayItem(this);

if (tray_rotation_lock)

AddTrayItem(std::move(tray_rotation_lock));

+ if (!use_md)

+ AddTrayItem(base::MakeUnique<TraySettings>(this));

AddTrayItem(base::WrapUnique(tray_update_));

if (use_md) {

tray_tiles_ = new TrayTiles(this);