ash/system/chromeos/session/logout_button_tray.cc - 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.cc

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

Patch Set: review comments, rename SetSystemTrayHeight to SetTrayBubbleHeight 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

« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.h ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f261819eb5d754f989e68996cedfbb76ed563c01..1ee41f03e32e51e11da62587fd978d439667bdbd 100644

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

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

@@ -16,7 +16,6 @@

#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/system/chromeos/session/logout_confirmation_controller.h"

-#include "ash/system/status_area_widget.h"

#include "base/logging.h"

#include "grit/ash_resources.h"

#include "third_party/skia/include/core/SkColor.h"

@@ -95,8 +94,8 @@ LogoutButton::LogoutButton(views::ButtonListener* listener)

LogoutButton::~LogoutButton() {}

-LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget)

- : TrayBackgroundView(status_area_widget->wm_shelf()),

+LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)

+ : TrayBackgroundView(wm_shelf),

button_(NULL),

login_status_(LoginStatus::NOT_LOGGED_IN),

show_logout_button_in_tray_(false) {

« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.h ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h » ('j') | no next file with comments »