ash/common/system/chromeos/screen_security/screen_share_tray_item.cc - Issue 2228183002: Updates to icons for Ash material design system tray

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/chromeos/screen_security/screen_share_tray_item.cc

Issue 2228183002: Updates to icons for Ash material design system tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gfx namespace Created 4 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:

View side-by-side diff with in-line comments

Download patch

« ash/common/system/cast/tray_cast.cc ('K') | « ash/common/system/chromeos/screen_security/screen_capture_tray_item.cc ('k') | ash/common/system/chromeos/screen_security/screen_tray_item.h » ('j') | ash/common/system/chromeos/screen_security/screen_tray_item.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

diff --git a/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc b/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

index 7af2ea8508f6cac2438d7b0265064a12941f80e6..663b3f341aadbcb6936e2ec4bb1ea557f8fb7dad 100644

--- a/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

+++ b/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

@@ -34,13 +34,13 @@ ScreenShareTrayItem::~ScreenShareTrayItem() {

}

views::View* ScreenShareTrayItem::CreateTrayView(LoginStatus status) {

- set_tray_view(new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_SCREENSHARE));

+ set_tray_view(new tray::ScreenTrayView(this));

return tray_view();

}

views::View* ScreenShareTrayItem::CreateDefaultView(LoginStatus status) {

set_default_view(new tray::ScreenStatusView(

- this, IDR_AURA_UBER_TRAY_SCREENSHARE_DARK,

+ this,

l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SCREEN_SHARE_BEING_HELPED),

l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SCREEN_SHARE_STOP)));

return default_view();