ash/system/tray/system_tray.cc - Issue 2826453003: Makes functions in container_finder take aura::Window

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.cc

Issue 2826453003: Makes functions in container_finder take aura::Window (Closed)

Patch Set: cleanup Created 3 years, 8 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.cc

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

index 6f6892a3a9c5708e4e8bd6d62f1f229f81e02d01..d6a15e80d1b2434a5e7e751221142952c1f12745 100644

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

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

@@ -178,9 +178,7 @@ class SystemTray::ActivationObserver

if (!tray_->HasSystemBubble() || !gained_active)

return;

- WmWindow* wm_gained_active = WmWindow::Get(gained_active);

- int container_id =

- wm::GetContainerForWindow(wm_gained_active)->aura_window()->id();

+ int container_id = wm::GetContainerForWindow(gained_active)->id();

// Don't close the bubble if a popup notification is activated.

if (container_id == kShellWindowId_StatusContainer)

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/system/tray/tray_event_filter.cc » ('j') | no next file with comments »