chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 1149263003: Add user_gesture param to BaseWindow::Activate

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

Issue 1149263003: Add user_gesture param to BaseWindow::Activate Base URL: https://chromium.googlesource.com/chromium/src.git@ug2_WebContentsDelegate_ActivateContents

Patch Set: Update callers Created 5 years, 7 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_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser_focus_uitest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0e6b955ca7a33a7ad24c4ca7b359b655f1ffe04c..d23e988e762b0c7e744a49d58ef0cba0619f50a6 100644

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

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

@@ -1108,7 +1108,7 @@ ChromeLauncherController::ActivateWindowOrMinimizeIfActive(

ash::MultiProfileUMA::RecordTeleportAction(

ash::MultiProfileUMA::TELEPORT_WINDOW_RETURN_BY_LAUNCHER);

manager->ShowWindowForUser(native_window, current_user);

- window->Activate();

+ window->Activate(true /* user_gesture */);

return ash::ShelfItemDelegate::kExistingWindowActivated;

}

@@ -1124,7 +1124,7 @@ ChromeLauncherController::ActivateWindowOrMinimizeIfActive(

}

} else {

window->Show();

- window->Activate();

+ window->Activate(true /* user_gesture */);

return ash::ShelfItemDelegate::kExistingWindowActivated;

}

return ash::ShelfItemDelegate::kNoAction;