Commit 42d2a131 authored by Lucas Tenório's avatar Lucas Tenório Committed by Commit Bot

Add a new LaunchSource to represent the Kiosk Next Home app.

Bug: 927809
Change-Id: I5ec26029f1ece2c102e4a9b792112100413033b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1558795
Commit-Queue: Lucas Tenório <ltenorio@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarMaajid <maajid@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Reviewed-by: default avatarNigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649859}
parent 0ef50a95
...@@ -259,6 +259,9 @@ void ArcApps::Launch(const std::string& app_id, ...@@ -259,6 +259,9 @@ void ArcApps::Launch(const std::string& app_id,
case apps::mojom::LaunchSource::kFromAppListRecommendation: case apps::mojom::LaunchSource::kFromAppListRecommendation:
uit = arc::UserInteractionType::APP_STARTED_FROM_LAUNCHER_SUGGESTED_APP; uit = arc::UserInteractionType::APP_STARTED_FROM_LAUNCHER_SUGGESTED_APP;
break; break;
case apps::mojom::LaunchSource::kFromKioskNextHome:
uit = arc::UserInteractionType::APP_STARTED_FROM_KIOSK_NEXT_HOME;
break;
} }
arc::LaunchApp(profile_, app_id, event_flags, uit, display_id); arc::LaunchApp(profile_, app_id, event_flags, uit, display_id);
......
...@@ -136,6 +136,7 @@ void BuiltInChromeOsApps::Launch(const std::string& app_id, ...@@ -136,6 +136,7 @@ void BuiltInChromeOsApps::Launch(const std::string& app_id,
int64_t display_id) { int64_t display_id) {
switch (launch_source) { switch (launch_source) {
case apps::mojom::LaunchSource::kUnknown: case apps::mojom::LaunchSource::kUnknown:
case apps::mojom::LaunchSource::kFromKioskNextHome:
break; break;
case apps::mojom::LaunchSource::kFromAppListGrid: case apps::mojom::LaunchSource::kFromAppListGrid:
case apps::mojom::LaunchSource::kFromAppListGridContextMenu: case apps::mojom::LaunchSource::kFromAppListGridContextMenu:
......
...@@ -161,6 +161,7 @@ void ExtensionApps::Launch(const std::string& app_id, ...@@ -161,6 +161,7 @@ void ExtensionApps::Launch(const std::string& app_id,
switch (launch_source) { switch (launch_source) {
case apps::mojom::LaunchSource::kUnknown: case apps::mojom::LaunchSource::kUnknown:
case apps::mojom::LaunchSource::kFromKioskNextHome:
break; break;
case apps::mojom::LaunchSource::kFromAppListGrid: case apps::mojom::LaunchSource::kFromAppListGrid:
case apps::mojom::LaunchSource::kFromAppListGridContextMenu: case apps::mojom::LaunchSource::kFromAppListGridContextMenu:
......
...@@ -13,6 +13,7 @@ ash::ShelfLaunchSource ConvertLaunchSource( ...@@ -13,6 +13,7 @@ ash::ShelfLaunchSource ConvertLaunchSource(
apps::mojom::LaunchSource launch_source) { apps::mojom::LaunchSource launch_source) {
switch (launch_source) { switch (launch_source) {
case apps::mojom::LaunchSource::kUnknown: case apps::mojom::LaunchSource::kUnknown:
case apps::mojom::LaunchSource::kFromKioskNextHome:
return ash::LAUNCH_FROM_UNKNOWN; return ash::LAUNCH_FROM_UNKNOWN;
case apps::mojom::LaunchSource::kFromAppListGrid: case apps::mojom::LaunchSource::kFromAppListGrid:
case apps::mojom::LaunchSource::kFromAppListGridContextMenu: case apps::mojom::LaunchSource::kFromAppListGridContextMenu:
......
...@@ -84,10 +84,8 @@ void AppControllerService::SetClient(mojom::AppControllerClientPtr client) { ...@@ -84,10 +84,8 @@ void AppControllerService::SetClient(mojom::AppControllerClientPtr client) {
} }
void AppControllerService::LaunchApp(const std::string& app_id) { void AppControllerService::LaunchApp(const std::string& app_id) {
// TODO(ltenorio): Create a new launch source for Kiosk Next Home and use it
// here.
app_service_proxy_->Launch(app_id, ui::EventFlags::EF_NONE, app_service_proxy_->Launch(app_id, ui::EventFlags::EF_NONE,
apps::mojom::LaunchSource::kFromAppListGrid, apps::mojom::LaunchSource::kFromKioskNextHome,
display::kDefaultDisplayId); display::kDefaultDisplayId);
} }
......
...@@ -138,6 +138,7 @@ enum LaunchSource { ...@@ -138,6 +138,7 @@ enum LaunchSource {
kFromAppListQuery, // Query-dependent results (larger icons). kFromAppListQuery, // Query-dependent results (larger icons).
kFromAppListQueryContextMenu, // Query-dependent results; context menu. kFromAppListQueryContextMenu, // Query-dependent results; context menu.
kFromAppListRecommendation, // Query-less recommendations (smaller icons). kFromAppListRecommendation, // Query-less recommendations (smaller icons).
kFromKioskNextHome, // Kiosk Next Home app.
}; };
enum TriState { enum TriState {
......
...@@ -86,7 +86,10 @@ enum class UserInteractionType { ...@@ -86,7 +86,10 @@ enum class UserInteractionType {
// User started an app from Smart Text Selection context menu. // User started an app from Smart Text Selection context menu.
APP_STARTED_FROM_SMART_TEXT_SELECTION_CONTEXT_MENU = 17, APP_STARTED_FROM_SMART_TEXT_SELECTION_CONTEXT_MENU = 17,
kMaxValue = APP_STARTED_FROM_SMART_TEXT_SELECTION_CONTEXT_MENU, // User started an app from the Kiosk Next Home app.
APP_STARTED_FROM_KIOSK_NEXT_HOME = 18,
kMaxValue = APP_STARTED_FROM_KIOSK_NEXT_HOME,
}; };
} // namespace arc } // namespace arc
......
...@@ -2449,6 +2449,7 @@ Unknown properties are collapsed to zero. --> ...@@ -2449,6 +2449,7 @@ Unknown properties are collapsed to zero. -->
<int value="15" label="App started by left-clicking on link"/> <int value="15" label="App started by left-clicking on link"/>
<int value="16" label="App started from link context menu"/> <int value="16" label="App started from link context menu"/>
<int value="17" label="App started from Smart Text Selection context menu"/> <int value="17" label="App started from Smart Text Selection context menu"/>
<int value="18" label="App started from Kiosk Next Home"/>
</enum> </enum>
<enum name="ArcVideoDecodeAcceleratorResult"> <enum name="ArcVideoDecodeAcceleratorResult">
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment