ash/system/tray/system_tray.cc - Issue 22654003: Create system tray item for accessing chrome://slow

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 22654003: Create system tray item for accessing chrome://slow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix non-chromeos build Created 7 years, 4 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/system/tray/system_tray.cc

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

index c93efc96d284f200e22844f9ec87530c72889810..122253f998668651da7a6dbba6d808c7f71c4143 100644

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

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

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

#include "ash/shell_window_ids.h"

#include "ash/system/bluetooth/tray_bluetooth.h"

#include "ash/system/brightness/tray_brightness.h"

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

#include "ash/system/date/tray_date.h"

#include "ash/system/drive/tray_drive.h"

#include "ash/system/ime/tray_ime.h"

@@ -167,6 +168,7 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {

tray_accessibility_ = new internal::TrayAccessibility(this);

AddTrayItem(tray_accessibility_);

#if defined(OS_CHROMEOS)

+ AddTrayItem(new internal::TrayTracing(this));

AddTrayItem(

new internal::TrayPower(this, message_center::MessageCenter::Get()));

#endif

« no previous file with comments | « ash/system/chromeos/tray_tracing.cc ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »