summaryrefslogtreecommitdiffstats
path: root/remoting/webapp
diff options
context:
space:
mode:
authorjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 22:28:34 +0000
committerjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 22:28:34 +0000
commit0a6ee8936aa5175f9411287d5b7fcf99f7af8719 (patch)
treeef653afe9e1b2fff51184069d4b39629d8b99aa1 /remoting/webapp
parent751fc718e21d98e0a8e8879449a9de61455ea7c4 (diff)
downloadchromium_src-0a6ee8936aa5175f9411287d5b7fcf99f7af8719.zip
chromium_src-0a6ee8936aa5175f9411287d5b7fcf99f7af8719.tar.gz
chromium_src-0a6ee8936aa5175f9411287d5b7fcf99f7af8719.tar.bz2
Add apps-v1-only class and apply it to the sign-out link.
Signing out is not a concept we support in Apps v2. BUG=263090 R=lambroslambrou@chromium.org Review URL: https://codereview.chromium.org/20476002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r--remoting/webapp/main.css8
-rw-r--r--remoting/webapp/main.html6
-rw-r--r--remoting/webapp/remoting.js1
3 files changed, 12 insertions, 3 deletions
diff --git a/remoting/webapp/main.css b/remoting/webapp/main.css
index 870796d..bb22ed7 100644
--- a/remoting/webapp/main.css
+++ b/remoting/webapp/main.css
@@ -27,6 +27,14 @@ body {
direction: __MSG_@@bidi_dir__;
}
+/*
+* The "app-v2" class is added to the <body> node by remoting.init if it's
+* running as a V2 app.
+*/
+body.apps-v2 .apps-v1-only {
+ display: none !important;
+}
+
a {
text-decoration: none;
color: #15c;
diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html
index 9fd08d3..afe006b 100644
--- a/remoting/webapp/main.html
+++ b/remoting/webapp/main.html
@@ -78,13 +78,13 @@ found in the LICENSE file.
<div class="box-spacer"></div>
<div id="top-secondary">
<span id="current-email"></span>
- <span data-ui-mode="home">
- <a id="sign-out" href="#" i18n-content="SIGN_OUT_BUTTON"></a> |
+ <span data-ui-mode="home" class="apps-v1-only">
+ <a id="sign-out" href="#" i18n-content="SIGN_OUT_BUTTON"></a>
<!-- TODO(jamiewalch): Add this back in when we support it.
<a id="connection-history"
i18n-content="CONNECTION_HISTORY_BUTTON"></a> |
-->
- </span>
+ </span> |
<a href="https://www.google.com/support/chrome/bin/answer.py?answer=1649523"
target="_blank" i18n-content="HELP"></a>
</div>
diff --git a/remoting/webapp/remoting.js b/remoting/webapp/remoting.js
index 93616b0..22ccad3 100644
--- a/remoting/webapp/remoting.js
+++ b/remoting/webapp/remoting.js
@@ -45,6 +45,7 @@ remoting.init = function() {
var manifest = chrome.runtime.getManifest();
if (manifest && manifest.app && manifest.app.background) {
remoting.isAppsV2 = true;
+ document.body.classList.add('apps-v2');
}
if (!remoting.isAppsV2) {