ash/system/tray/system_tray_bubble.cc - Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell

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/tray/system_tray_bubble.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review feedback 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:

Index: ash/system/tray/system_tray_bubble.cc

diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc

index 1fbd18867cd072274969ee0ea5251ef3472440a1..04f6e81b5d0f857c1d1a31c92ecc86a073b36a14 100644

--- a/ash/system/tray/system_tray_bubble.cc

+++ b/ash/system/tray/system_tray_bubble.cc

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

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

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

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/system/tray/system_tray.h"

#include "ash/system/tray/system_tray_item.h"

@@ -138,8 +139,7 @@ void SystemTrayBubble::UpdateView(

items_ = items;

bubble_type_ = bubble_type;

- CreateItemViews(

- Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus());

+ CreateItemViews(WmShell::Get()->system_tray_delegate()->GetUserLoginStatus());

// Close bubble view if we failed to create the item view.

if (!bubble_view_->has_children()) {