summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-mash_package_mash__packaged__service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-mash_package_mash__packaged__service.cc')
-rw-r--r--www/chromium/files/patch-mash_package_mash__packaged__service.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-mash_package_mash__packaged__service.cc b/www/chromium/files/patch-mash_package_mash__packaged__service.cc
index 2422ce462458..5f8421fa180b 100644
--- a/www/chromium/files/patch-mash_package_mash__packaged__service.cc
+++ b/www/chromium/files/patch-mash_package_mash__packaged__service.cc
@@ -1,15 +1,15 @@
---- mash/package/mash_packaged_service.cc.orig 2017-02-02 02:02:55 UTC
+--- mash/package/mash_packaged_service.cc.orig 2017-03-09 20:04:34 UTC
+++ mash/package/mash_packaged_service.cc
-@@ -19,7 +19,7 @@
- #include "services/ui/public/interfaces/constants.mojom.h"
- #include "services/ui/service.h"
+@@ -29,7 +29,7 @@
+ #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck
+ #endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/font_service/font_service_app.h"
#endif
-@@ -91,7 +91,7 @@ std::unique_ptr<service_manager::Service
+@@ -103,7 +103,7 @@ std::unique_ptr<service_manager::Service
return base::WrapUnique(new mash::task_viewer::TaskViewer);
if (name == "test_ime_driver")
return base::WrapUnique(new ui::test::TestIMEApplication);