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

Unified Diff: chrome/browser/resources/chromeos/arc_support/background.js

Issue 2545793003: Do not show "Just a sec" page if arc-loading page is shown. (Closed)
Patch Set: Created 4 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/arc_support/background.js
diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrome/browser/resources/chromeos/arc_support/background.js
index d47a9ac7aabcbaf2b28bbb9b341da0386b226592..40d2a296c34d0448f4ba3bce16fae9779f0e7a34 100644
--- a/chrome/browser/resources/chromeos/arc_support/background.js
+++ b/chrome/browser/resources/chromeos/arc_support/background.js
@@ -487,9 +487,15 @@ function showPage(pageDivId) {
hideOverlay();
var doc = appWindow.contentWindow.document;
- var pages = doc.getElementsByClassName('section');
- for (var i = 0; i < pages.length; i++) {
- pages[i].hidden = pages[i].id != pageDivId;
+ // If the request is lso-loading and arc-loading page is currently shown,
+ // then we do not switch the view. This is because both pages are saying
+ // "operation in progress", and switching the page looks unwanted message
+ // change from users' point of view.
+ if (pageDivId != 'lso-loading' || doc.getElementById('arc-loading').hidden) {
+ var pages = doc.getElementsByClassName('section');
+ for (var i = 0; i < pages.length; i++) {
+ pages[i].hidden = pages[i].id != pageDivId;
+ }
}
if (pageDivId == 'lso-loading') {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698