diff options
| author | garykac <garykac@chromium.org> | 2015-06-12 18:16:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-13 01:18:14 +0000 |
| commit | 1f79129e5d41c461e13b2d47f53f3ab39a3b9f66 (patch) | |
| tree | 2f30a0c24da5f02346f6ee2ae72854401a0cfe16 /remoting/webapp/app_remoting/html | |
| parent | ec80f71bf1a341b2cb1987cc29645596fcf94c57 (diff) | |
| download | chromium_src-1f79129e5d41c461e13b2d47f53f3ab39a3b9f66.zip chromium_src-1f79129e5d41c461e13b2d47f53f3ab39a3b9f66.tar.gz chromium_src-1f79129e5d41c461e13b2d47f53f3ab39a3b9f66.tar.bz2 | |
[AppRemoting] Break out AppRemoting shared module.
This cl breaks out the shared AppRemoting code into a shared module so
that it does not need to be duplicated in each individual app.
This version has the following limitations which will be addressed in
follow-up cls:
(1) The apps have a hard-coded reference to the dev shared module
(2) The apps have a hard-coded reference to the dev orchestrator
(3) The resources in the app stub should be replaced with empty stub
resources rather than a copy of all the shared resources.
(4) The shared module is only built in GN (not GYP)
BUG=
Review URL: https://codereview.chromium.org/1176143002
Cr-Commit-Position: refs/heads/master@{#334312}
Diffstat (limited to 'remoting/webapp/app_remoting/html')
5 files changed, 24 insertions, 4 deletions
diff --git a/remoting/webapp/app_remoting/html/context_menu.html b/remoting/webapp/app_remoting/html/context_menu.html index ebc056e..010c86d 100644 --- a/remoting/webapp/app_remoting/html/context_menu.html +++ b/remoting/webapp/app_remoting/html/context_menu.html @@ -6,7 +6,7 @@ found in the LICENSE file. <div id="context-menu" draggable="true" hidden> <div class="no-gaps"> - <img src="icon48.png" class="context-menu-icon"> + <img src="/icon48.png" class="context-menu-icon"> <span class="context-menu-stub etched"></span> </div> <ul> diff --git a/remoting/webapp/app_remoting/html/template_background.html b/remoting/webapp/app_remoting/html/template_background.html new file mode 100644 index 0000000..10d293b --- /dev/null +++ b/remoting/webapp/app_remoting/html/template_background.html @@ -0,0 +1,18 @@ +<!doctype html> +<!-- +Copyright 2015 The Chromium Authors. All rights reserved. +Use of this source code is governed by a BSD-style license that can be +found in the LICENSE file. +--> + +<html> + <head> + <meta charset="utf-8"> + + <meta-include type="javascript"/> + + <title></title> + </head> + <body> + </body> +</html> diff --git a/remoting/webapp/app_remoting/html/template_feedback_consent.html b/remoting/webapp/app_remoting/html/template_feedback_consent.html index 6fc98d8..4d839e4 100644 --- a/remoting/webapp/app_remoting/html/template_feedback_consent.html +++ b/remoting/webapp/app_remoting/html/template_feedback_consent.html @@ -8,7 +8,7 @@ found in the LICENSE file. <html> <head> <meta charset="utf-8"> - <link rel="icon" type="image/png" href="icon16.png"> + <link rel="icon" type="image/png" href="/icon16.png"> <link rel="stylesheet" href="open_sans.css"> <link rel="stylesheet" href="feedback_consent.css"> <link rel="stylesheet" href="main.css"> diff --git a/remoting/webapp/app_remoting/html/template_lg.html b/remoting/webapp/app_remoting/html/template_lg.html index 6f27a94..18aa95e 100644 --- a/remoting/webapp/app_remoting/html/template_lg.html +++ b/remoting/webapp/app_remoting/html/template_lg.html @@ -8,7 +8,7 @@ found in the LICENSE file. <html class="full-height app-remoting"> <head> <meta charset="utf-8"> - <link rel="icon" type="image/png" href="icon16.png"> + <link rel="icon" type="image/png" href="/icon16.png"> <link rel="stylesheet" href="ar_main.css"> <link rel="stylesheet" href="ar_dialog.css"> <link rel="stylesheet" href="connection_stats.css"> @@ -19,6 +19,8 @@ found in the LICENSE file. <meta-include type="javascript"/> + <link rel="import" href="/arv_main.html"> + <title i18n-content="PRODUCT_NAME_APP_STREAMING"></title> </head> diff --git a/remoting/webapp/app_remoting/html/template_loading_window.html b/remoting/webapp/app_remoting/html/template_loading_window.html index b69432e..713e798 100644 --- a/remoting/webapp/app_remoting/html/template_loading_window.html +++ b/remoting/webapp/app_remoting/html/template_loading_window.html @@ -17,7 +17,7 @@ found in the LICENSE file. <title></title> </head> <body> - <img src="loading_splash.png" id="splash-image"> + <img src="/loading_splash.png" id="splash-image"> <div class="message-container"> <div id="title" hidden></div> <p id="infobox" class="information-box"></p> |