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

Unified Diff: remoting/app_remoting_webapp_files.gypi

Issue 1191883002: Revert of [AppRemoting] Break out AppRemoting shared module (re-land). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « remoting/app_remoting_webapp_build.gypi ('k') | remoting/remoting_options.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/app_remoting_webapp_files.gypi
diff --git a/remoting/app_remoting_webapp_files.gypi b/remoting/app_remoting_webapp_files.gypi
index 09ce4a24f0145688e590d5babd934ea08b342571..fc5686d3ba19eef0ec1d4ef7f5faad36f80a254e 100644
--- a/remoting/app_remoting_webapp_files.gypi
+++ b/remoting/app_remoting_webapp_files.gypi
@@ -57,6 +57,7 @@
'webapp/app_remoting/js/app_remoting.js',
'webapp/app_remoting/js/app_remoting_activity.js',
'webapp/app_remoting/js/ar_auth_dialog.js',
+ 'webapp/app_remoting/js/ar_main.js',
'webapp/app_remoting/js/context_menu_adapter.js',
'webapp/app_remoting/js/context_menu_chrome.js',
'webapp/app_remoting/js/context_menu_dom.js',
@@ -68,6 +69,8 @@
'webapp/app_remoting/js/loading_window.js',
'webapp/app_remoting/js/submenu_manager.js',
'webapp/app_remoting/js/window_activation_menu.js',
+ 'webapp/base/js/application.js',
+ 'webapp/base/js/base.js',
'webapp/base/js/message_window_helper.js',
'webapp/base/js/message_window_manager.js',
'<@(remoting_webapp_shared_js_auth_google_files)',
@@ -79,22 +82,9 @@
'<@(remoting_webapp_shared_js_ui_files)',
],
- # Variables for ar_background.html.
- 'ar_background_template':
- '<(DEPTH)/remoting/webapp/app_remoting/html/template_background.html',
- 'ar_background_html_js_files': [
+ 'ar_background_js_files': [
'webapp/app_remoting/js/ar_background.js',
'webapp/base/js/platform.js',
- ],
-
- 'ar_vendor_js_files': [
- 'webapp/app_remoting/vendor/arv_main.js',
- ],
-
- 'ar_vendor_html_files': [
- 'webapp/app_remoting/vendor/arv_background.html',
- 'webapp/app_remoting/vendor/arv_main.html',
- 'webapp/app_remoting/vendor/arv_wcs_sandbox.html',
],
'ar_all_js_files': [
@@ -102,7 +92,8 @@
'<@(ar_feedback_consent_html_js_files)',
'<@(remoting_webapp_message_window_html_js_files)',
'<@(remoting_webapp_wcs_sandbox_html_js_files)',
- '<@(ar_background_html_js_files)',
+ # Referenced from the manifest.
+ '<@(ar_background_js_files)',
],
# Files that contain localizable strings.
« no previous file with comments | « remoting/app_remoting_webapp_build.gypi ('k') | remoting/remoting_options.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698