ash/common/system/chromeos/screen_security/screen_tray_item.h - 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_tray_item.h

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

Patch Set: const ref 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

« no previous file with comments | « ash/common/system/chromeos/screen_security/screen_share_tray_item.cc ('k') | ash/common/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/screen_security/screen_tray_item.h

diff --git a/ash/common/system/chromeos/screen_security/screen_tray_item.h b/ash/common/system/chromeos/screen_security/screen_tray_item.h

index 06590994477a446b4b20d1cdf6ac61d39b3c798c..7f2908f552396de17185cdabe972994df04d8c5a 100644

--- a/ash/common/system/chromeos/screen_security/screen_tray_item.h

+++ b/ash/common/system/chromeos/screen_security/screen_tray_item.h

@@ -28,7 +28,7 @@ namespace tray {

class ScreenTrayView : public TrayItemView {

public:

- ScreenTrayView(ScreenTrayItem* screen_tray_item, int icon_id);

+ explicit ScreenTrayView(ScreenTrayItem* screen_tray_item);

~ScreenTrayView() override;

void Update();

@@ -42,7 +42,6 @@ class ScreenTrayView : public TrayItemView {

class ScreenStatusView : public views::View, public views::ButtonListener {

public:

ScreenStatusView(ScreenTrayItem* screen_tray_item,

- int icon_id,

const base::string16& label_text,

const base::string16& stop_button_text);

~ScreenStatusView() override;

@@ -61,7 +60,6 @@ class ScreenStatusView : public views::View, public views::ButtonListener {

views::ImageView* icon_;

views::Label* label_;

TrayPopupLabelButton* stop_button_;

- int icon_id_;

base::string16 label_text_;

base::string16 stop_button_text_;