summaryrefslogtreecommitdiffstats
path: root/remoting/app_remoting_webapp_build.gypi
diff options
context:
space:
mode:
authorjamiewalch <jamiewalch@chromium.org>2015-04-27 15:43:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-27 22:42:51 +0000
commit9c9f27b5a454bfe763d07c4847235e531c3df200 (patch)
tree97f5eca03baacb45fe6eaa5357eb5ea7a5803036 /remoting/app_remoting_webapp_build.gypi
parent63b2a20daf725ae044410d92a85a5fbebec27bea (diff)
downloadchromium_src-9c9f27b5a454bfe763d07c4847235e531c3df200.zip
chromium_src-9c9f27b5a454bfe763d07c4847235e531c3df200.tar.gz
chromium_src-9c9f27b5a454bfe763d07c4847235e531c3df200.tar.bz2
Make loading dialog prettier.
Since the width of this dialog is no longer fixed, this CL also updates base.resizeWindowToContent to set the width as well as the height, and adds support for centering. BUG=b/19796166 Review URL: https://codereview.chromium.org/1081813007 Cr-Commit-Position: refs/heads/master@{#327160}
Diffstat (limited to 'remoting/app_remoting_webapp_build.gypi')
-rw-r--r--remoting/app_remoting_webapp_build.gypi20
1 files changed, 20 insertions, 0 deletions
diff --git a/remoting/app_remoting_webapp_build.gypi b/remoting/app_remoting_webapp_build.gypi
index aae7f99..9f7572cb 100644
--- a/remoting/app_remoting_webapp_build.gypi
+++ b/remoting/app_remoting_webapp_build.gypi
@@ -37,8 +37,10 @@
'>(ar_app_path)/icon16.png',
'>(ar_app_path)/icon48.png',
'>(ar_app_path)/icon128.png',
+ '>(ar_app_path)/loading_splash.png',
],
'ar_generated_html_files': [
+ '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
'<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html',
'<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html',
'<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
@@ -177,6 +179,24 @@
],
},
{
+ 'action_name': 'Build ">(ar_app_name)" loading_window.html',
+ 'inputs': [
+ '<(DEPTH)/remoting/webapp/build-html.py',
+ '<(ar_loading_window_template)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
+ ],
+ 'action': [
+ 'python', '<(DEPTH)/remoting/webapp/build-html.py',
+ '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
+ '<(ar_loading_window_template)',
+ # The loading window is just a reskin of the message window--all
+ # JS code is shared.
+ '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
+ ],
+ },
+ {
'action_name': 'Build ">(ar_app_name)" message_window.html',
'inputs': [
'<(DEPTH)/remoting/webapp/build-html.py',