ash/system/settings/tray_settings.h - 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/settings/tray_settings.h

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

Patch Set: 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/settings/tray_settings.h

diff --git a/ash/system/settings/tray_settings.h b/ash/system/settings/tray_settings.h

index 9bfeca3ffdd31ffbed1bc5e4d03d908f75aaaf3b..f47bde83cffe3161f1af7c0d01ac11adbe8fda5f 100644

--- a/ash/system/settings/tray_settings.h

+++ b/ash/system/settings/tray_settings.h

@@ -24,7 +24,8 @@ class TraySettings : public SystemTrayItem,

private:

// Overridden from SystemTrayItem

virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;

- virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;

+ virtual views::View* CreateDefaultView(user::LoginStatus status,

+ int bubble_width) OVERRIDE;

virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;

virtual void DestroyTrayView() OVERRIDE;

virtual void DestroyDefaultView() OVERRIDE;