summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/resources/components.js
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@theqtcompany.com>2014-12-05 15:04:29 +0100
committerAndras Becsi <andras.becsi@theqtcompany.com>2014-12-09 10:49:28 +0100
commitaf6588f8d723931a298c995fa97259bb7f7deb55 (patch)
tree060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/chrome/browser/resources/components.js
parent2fff84d821cc7b1c785f6404e0f8091333283e74 (diff)
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/chrome/browser/resources/components.js')
-rw-r--r--chromium/chrome/browser/resources/components.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/chromium/chrome/browser/resources/components.js b/chromium/chrome/browser/resources/components.js
index 64b6e3a00c9..01925a941a4 100644
--- a/chromium/chrome/browser/resources/components.js
+++ b/chromium/chrome/browser/resources/components.js
@@ -67,9 +67,13 @@ function returnComponentsData(componentsData) {
};
}
- // Disable some controls for Guest in ChromeOS.
- if (cr.isChromeOS)
- uiAccountTweaks.UIAccountTweaks.applyGuestModeVisibility(document);
+ if (cr.isChromeOS) {
+ // Disable some controls for Guest in ChromeOS.
+ uiAccountTweaks.UIAccountTweaks.applyGuestSessionVisibility(document);
+
+ // Disable some controls for Public session in ChromeOS.
+ uiAccountTweaks.UIAccountTweaks.applyPublicSessionVisibility(document);
+ }
bodyContainer.style.visibility = 'visible';
body.className = 'show-tmi-mode-initial';