ash/system/chromeos/session/logout_button_tray.h - Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes

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/chromeos/session/logout_button_tray.h

Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tweak Created 4 years, 6 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

Index: ash/system/chromeos/session/logout_button_tray.h

diff --git a/ash/system/chromeos/session/logout_button_tray.h b/ash/system/chromeos/session/logout_button_tray.h

index 29fcb74343fe7f57815a258c60bc4994627a420e..fb2bc8959a172ca07708b9863c0970f32e0350c7 100644

--- a/ash/system/chromeos/session/logout_button_tray.h

+++ b/ash/system/chromeos/session/logout_button_tray.h

@@ -9,7 +9,6 @@

#include "ash/common/login_status.h"

#include "ash/common/system/chromeos/session/logout_button_observer.h"

#include "ash/common/system/tray/tray_background_view.h"

-#include "base/compiler_specific.h"

#include "base/macros.h"

#include "base/time/time.h"

#include "ui/views/controls/button/button.h"

@@ -20,7 +19,7 @@ class LabelButton;

namespace ash {

-class StatusAreaWidget;

+class WmShelf;

msw 2016/06/27 23:57:36 optional nit: rely on tray_background_view.h forwa

James Cook 2016/06/28 00:47:25 Done.

// Adds a logout button to the launcher's status area if enabled by the

// kShowLogoutButtonInTray pref.

@@ -28,7 +27,7 @@ class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView,

public LogoutButtonObserver,

public views::ButtonListener {

public:

- explicit LogoutButtonTray(StatusAreaWidget* status_area_widget);

+ explicit LogoutButtonTray(WmShelf* wm_shelf);

~LogoutButtonTray() override;

// TrayBackgroundView:

« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/system/chromeos/session/logout_button_tray.cc » ('j') | ash/system/status_area_widget.cc » ('J')