chrome/browser/ui/ash/launcher/browser_status_monitor.cc - Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...).

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: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Uploaded diff based on dependant CL. Created 5 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 | « chrome/browser/ui/ash/launcher/browser_status_monitor.h ('k') | chrome/browser/ui/views/extensions/extension_popup_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

index 08f96c0d5710b7baa038130e2d47a0fc53afcc7d..0ef0124e6e7b549bfac970b43d64adb22a6d7b80 100644

--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -164,8 +164,10 @@ void BrowserStatusMonitor::UpdateBrowserItemState() {

UpdateBrowserItemState();

}

-void BrowserStatusMonitor::OnWindowActivated(aura::Window* gained_active,

- aura::Window* lost_active) {

+void BrowserStatusMonitor::OnWindowActivated(

+ aura::client::ActivationChangeObserver::ActivationReason reason,

+ aura::Window* gained_active,

+ aura::Window* lost_active) {

Browser* browser = NULL;

content::WebContents* contents_from_gained = NULL;

content::WebContents* contents_from_lost = NULL;