ash/system/user/tray_user.cc - Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items

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/user/tray_user.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix single-letter typo :(. Created 8 years, 1 month 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/user/tray_user.cc

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc

index 8330ff86c47ce1c126c05512f0dfb8610bd90545..8e947396c1385aa586aff3e5ab74ad4606bf430e 100644

--- a/ash/system/user/tray_user.cc

+++ b/ash/system/user/tray_user.cc

@@ -239,8 +239,9 @@ class UserView : public views::View,

} // namespace tray

-TrayUser::TrayUser()

- : user_(NULL),

+TrayUser::TrayUser(SystemTray* system_tray)

+ : SystemTrayItem(system_tray),

+ user_(NULL),

avatar_(NULL),

label_(NULL) {

}

« no previous file with comments | « ash/system/user/tray_user.h ('k') | ash/wm/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »