Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4744)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Fixed use-after-free Created 4 years 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/launcher_controller_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 08fdcf647721fab6bfd366aa2e3e89c7cd11188d..947ff5b4d9c806d36b3b0cf4eca671a13301a10d 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -2008,7 +2008,14 @@ void BrowserOptionsHandler::ShowAndroidAppsSettings(
return;
}
- arc::LaunchAndroidSettingsApp(profile);
+ // We only care whether the event came from a keyboard or non-keyboard
+ // (mouse/touch). Set the default flags in such a way that it would appear
+ // that it came from a mouse by default.
+ bool activated_from_keyboard = false;
+ args->GetBoolean(0, &activated_from_keyboard);
+ int flags = activated_from_keyboard ? ui::EF_NONE : ui::EF_LEFT_MOUSE_BUTTON;
+
+ arc::LaunchAndroidSettingsApp(profile, flags);
}
void BrowserOptionsHandler::ShowAccessibilityTalkBackSettings(
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_controller_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698