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

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: Rebase to ToT Created 4 years, 1 month 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
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..6fab852cf89969687c447167e52a1f5ecc37dd0b 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -2008,7 +2008,15 @@ 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.
+ int flags = ui::EF_LEFT_MOUSE_BUTTON;
stevenjb 2016/11/29 20:17:10 Again, since what we really care about is whether
Luis Héctor Chávez 2016/11/29 20:50:46 Done.
+ bool is_mouse_or_touch = true;
+ if (args->GetBoolean(0, &is_mouse_or_touch) && !is_mouse_or_touch)
+ flags = ui::EF_NONE;
stevenjb 2016/11/29 20:17:10 nit: int flags = is_mouse_or_touch ? ui::EF_LEFT_
Luis Héctor Chávez 2016/11/29 20:50:46 Done.
+
+ arc::LaunchAndroidSettingsApp(profile, flags);
}
void BrowserOptionsHandler::ShowAccessibilityTalkBackSettings(

Powered by Google App Engine
This is Rietveld 408576698