chromium/src
0
Fork 0
Code Activity

Add catalog_viewer to mash_packaged_service.

Browse Source 
We were getting errors when trying to run catalog_viewer from quick launch. This
CL fixes that.

BUG=NONE

Review-Url: https://codereview.chromium.org/2470383002
Cr-Commit-Position: refs/heads/master@{#429636}
This commit is contained in:
moshayedi
2016-11-03 10:42:02 -07:00
committed by Commit bot
parent 4def16f9b6
commit 6beed581f1
4 changed files with 8 additions and 0 deletions

2
chrome/app/mash/BUILD.gn

@ -43,6 +43,7 @@ service_manifest("mash_manifest") {
"//ash/autoclick/mus:manifest",
"//ash/mus:manifest",
"//ash/touch_hud/mus:manifest",
"//mash/catalog_viewer:manifest",
"//mash/quick_launch:manifest",
"//mash/session:manifest",
"//mash/task_viewer:manifest",
@ -52,6 +53,7 @@ service_manifest("mash_manifest") {
packaged_services = [
"accessibility_autoclick",
"ash",
"catalog_viewer",
"mash_session",
"quick_launch",
"task_viewer",

2
chrome/test/BUILD.gn

@ -5027,6 +5027,7 @@ if (is_chromeos) {
"//ash/autoclick/mus:manifest",
"//ash/mus:manifest",
"//ash/touch_hud/mus:manifest",
"//mash/catalog_viewer:manifest",
"//mash/quick_launch:manifest",
"//mash/session:manifest",
"//mash/task_viewer:manifest",
@ -5036,6 +5037,7 @@ if (is_chromeos) {
packaged_services = [
"accessibility_autoclick",
"ash",
"catalog_viewer",
"mash_session",
"quick_launch",
"task_viewer",

1
mash/package/BUILD.gn

@ -12,6 +12,7 @@ source_set("package") {
"//ash/autoclick/mus:lib",
"//ash/mus:lib",
"//ash/touch_hud/mus:lib",
"//mash/catalog_viewer:lib",
"//mash/public/interfaces",
"//mash/quick_launch:lib",
"//mash/session:lib",

3
mash/package/mash_packaged_service.cc

@ -7,6 +7,7 @@
#include "ash/autoclick/mus/autoclick_application.h"
#include "ash/mus/window_manager_application.h"
#include "ash/touch_hud/mus/touch_hud_application.h"
#include "mash/catalog_viewer/catalog_viewer.h"
#include "mash/quick_launch/quick_launch.h"
#include "mash/session/session.h"
#include "mash/task_viewer/task_viewer.h"
@ -61,6 +62,8 @@ std::unique_ptr<service_manager::Service> MashPackagedService::CreateService(
return base::WrapUnique(new ash::mus::WindowManagerApplication);
if (name == "service:accessibility_autoclick")
return base::WrapUnique(new ash::autoclick::AutoclickApplication);
if (name == "service:catalog_viewer")
return base::WrapUnique(new mash::catalog_viewer::CatalogViewer);
if (name == "service:touch_hud")
return base::WrapUnique(new ash::touch_hud::TouchHudApplication);
if (name == "service:mash_session")