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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 635233008: Make management.launchApp() work for hosted apps on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webstore_dialogs_athena
Patch Set: Created 6 years, 2 months 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/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 8530c6666444e097b78569f52cb39a5b203ad2dc..6b57cb1ed1d8f158dafbe2cbffae4f90cc24ba95 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1413,6 +1413,9 @@
'browser/ui/elide_url.h',
'browser/ui/extensions/application_launch.cc',
'browser/ui/extensions/application_launch.h',
+ 'browser/ui/extensions/application_launch_hosted_app.h',
+ 'browser/ui/extensions/app_launch_params.cc',
+ 'browser/ui/extensions/app_launch_params.h',
'browser/ui/extensions/extension_install_ui_default.cc',
'browser/ui/extensions/extension_install_ui_default.h',
'browser/ui/extensions/extension_install_ui_factory.cc',
@@ -2461,12 +2464,15 @@
'chrome_browser_ui_athena_sources': [
#TODO(mukai): Port AppListService to Athena (crbug.com/417571)
'browser/ui/app_list/app_list_service_disabled.cc',
-
+ 'browser/ui/athena/extensions/application_launch_hosted_app_athena.cc',
'browser/ui/views/athena/athena_util.cc',
'browser/ui/views/athena/athena_util.h',
'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
],
+ 'chrome_browser_ui_non_athena_non_android_sources': [
+ 'browser/ui/extensions/application_launch_hosted_app.cc',
+ ],
# Counts desktop Linux and ChromeOS.
'chrome_browser_ui_linux_sources': [
'browser/ui/startup/autolaunch_prompt.cc',
@@ -2733,6 +2739,9 @@
],
}, { # use_athena==0
'conditions': [
+ ['OS!="android"', {
+ 'sources': [ '<@(chrome_browser_ui_non_athena_non_android_sources)' ],
+ }],
['use_ash==1', {
'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
}],

Powered by Google App Engine
This is Rietveld 408576698