Fixed new promo banner showing condition.

chrome/browser/resources/file_manager/js/drive_banners.js

 // Copyright (c) 2012 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.
 
 /**
  * Responsible for showing banners in the file list.
  * @param {DirectoryModel} directoryModel The model.
  * @param {DOMDocument} document HTML document.
  * @constructor
  */
 function FileListBannerController(directoryModel, document) {
   this.directoryModel_ = directoryModel;
   this.document_ = document;
   this.driveEnabled_ = false;
 
   var board = str('CHROMEOS_RELEASE_BOARD');
-  // It is 'canary' or 'beta' for the other channels.
-  var releaseChannel = str('BROWSER_VERSION_MODIFIER') == '';
-  this.newWelcome_ = board.match(/^(stumpy|lumpy)/i) && releaseChannel;
+  if (board.match(/^(stumpy|lumpy)/i))
+    this.checkPromoAvailable_();
+  else
+    this.newWelcome_ = false;
 
   var handler = this.checkSpaceAndShowBanner_.bind(this);
   this.directoryModel_.addEventListener('scan-completed', handler);
   this.directoryModel_.addEventListener('rescan-completed', handler);
   this.directoryModel_.addEventListener('directory-changed',
       this.onDirectoryChanged_.bind(this));
 }
 
 /**
  * FileListBannerController extends cr.EventTarget.
@@ skipping 21 matching lines @@
  */
 var GOOGLE_DRIVE_FAQ_URL =
       'https://support.google.com/chromeos/?p=filemanager_drive';
 
 /**
  * Location of the page to buy more storage for Google Drive.
  */
 var GOOGLE_DRIVE_BUY_STORAGE =
     'https://www.google.com/settings/storage';
 
+var GOOGLE_DRIVE_REDEEM = 'https://drive.google.com/redeem';
+
 /**
  * Location of the FAQ about the downloads directory.
  */
 var DOWNLOADS_FAQ_URL =
     'http://support.google.com/chromeos/bin/answer.py?answer=1061547';
 
 /**
  * @return {number} How many times the Drive Welcome header banner has shown.
  * @private
  */
@@ skipping 81 matching lines @@
   }
 
   var counter = this.getHeaderCounter_();
 
   if (this.directoryModel_.getFileList().length == 0 && counter == 0) {
     // Only show the full page banner if the header banner was never shown.
     // Do not increment the counter.
     // The timeout below is required because sometimes another
     // 'rescan-completed' event arrives shortly with non-empty file list.
     var self = this;
-    setTimeout(function() {
+    setTimeout(this.preparePromo_.bind(this, function() {
       var container = self.document_.querySelector('.dialog-container');
       if (self.isOnGData() &&
           container.getAttribute('gdrive-welcome') != 'header')
             self.showBanner_('page', 'GDATA_WELCOME_TEXT_LONG');
-        }, 2000);
+        }, 2000));
   } else if (counter < WELCOME_HEADER_COUNTER_LIMIT) {
     // We do not want to increment the counter when the user navigates
     // between different directories on GDrive, but we increment the counter
     // once anyway to prevent the full page banner from showing.
-     if (!this.previousDirWasOnGData_ || counter == 0)
-       localStorage[WELCOME_HEADER_COUNTER_KEY] = ++counter;
-       this.showBanner_('header', 'GDATA_WELCOME_TEXT_SHORT');
+     if (!this.previousDirWasOnGData_ || counter == 0) {
+       var self = this;
+       this.preparePromo_(function() {
+         localStorage[WELCOME_HEADER_COUNTER_KEY] = ++counter;
+         self.showBanner_('header', 'GDATA_WELCOME_TEXT_SHORT');
+       });
+     }
    } else {
      this.closeBanner_();
    }
    this.previousDirWasOnGData_ = true;
 };
 
 /**
  * Show or hide the "Low Google Drive space" warning.
  * @param {boolean} show True if the box need to be shown.
  * @param {object} sizeStats Size statistics.
  * @private
  */
 FileListBannerController.prototype.showLowGDriveSpaceWarning_ =
       function(show, sizeStats) {
   var box = this.document_.querySelector('.gdrive-space-warning');
 
+  // Avoid showing two banners.
+  // TODO(kaznacheev): Unify the low space warning and the promo header.
+  if (show) this.cleanupGDataWelcome_();
+
+  if (box.hidden == !show) return;
+
   // If the warning was dismissed before, this key stores the quota value
   // (as of the moment of dismissal).
   // If the warning was never dismissed or was reset this key stores 0.
   var WARNING_DISMISSED_KEY = 'gdriveSpaceWarningDismissed';
   var dismissed = parseInt(localStorage[WARNING_DISMISSED_KEY] || '0');
 
   if (dismissed) {
     if (dismissed == sizeStats.totalSizeKB &&  // Quota had not changed
         sizeStats.remainingSizeKB / sizeStats.totalSizeKB < 0.15) {
       // Since the last dismissal decision the quota has not changed AND
       // the user did not free up significant space. Obey the dismissal.
       show = false;
     } else {
       // Forget the dismissal. Warning will be shown again.
       localStorage[WARNING_DISMISSED_KEY] = 0;
     }
   }
 
-  // Avoid showing two banners.
-  // TODO(kaznacheev): Unify the low space warning and the promo header.
-  if (show) this.cleanupGDataWelcome_();
-
-  if (box.hidden == !show) return;
-
   box.textContent = '';
   if (show) {
     var icon = this.document_.createElement('div');
     icon.className = 'gdrive-icon';
     box.appendChild(icon);
 
     var text = this.document_.createElement('div');
     text.className = 'gdrive-text';
     text.textContent = strf('GDATA_SPACE_AVAILABLE_LONG',
         util.bytesToSi(sizeStats.remainingSizeKB * 1024));
@@ skipping 93 matching lines @@
   // Stop showing the welcome banner.
   localStorage[WELCOME_HEADER_COUNTER_KEY] = WELCOME_HEADER_COUNTER_LIMIT;
 };
 
 /**
  * Shows or hides the Low Disck Space banner.
  * @private
  */
 FileListBannerController.prototype.checkSpaceAndShowBanner_ = function() {
   var self = this;
-  if (this.newWelcome_ && this.isOnGData())
-    chrome.fileBrowserPrivate.getSizeStats(
-        util.makeFilesystemUrl(this.directoryModel_.getCurrentRootPath()),
-    function(result) {
-      if (result.totalSizeKB >= 100 * 1024 * 1024)  // Already >= 100 GB.
-        self.newWelcome_ = false;
-        self.maybeShowBanner_();
-    });
-  else
-    self.maybeShowBanner_();
+  this.preparePromo_(function() {
+    if (this.newWelcome_ && this.isOnGData())
+      chrome.fileBrowserPrivate.getSizeStats(
+          util.makeFilesystemUrl(this.directoryModel_.getCurrentRootPath()),
+      function(result) {
+        if (result.totalSizeKB >= 100 * 1024 * 1024)  // Already >= 100 GB.
+          self.newWelcome_ = false;
+          self.maybeShowBanner_();
+      });
+    else
+      self.maybeShowBanner_();
+  });
 };
 
 /**
  * @return {boolean} True if current directory is on Drive.
  */
 FileListBannerController.prototype.isOnGData = function() {
   return this.directoryModel_.getCurrentRootType() === RootType.GDATA;
 };
 
 /**
@@ skipping 59 matching lines @@
     var link = box.querySelector('a');
     link.href = DOWNLOADS_FAQ_URL;
   } else {
     box.innerHTML = '';
   }
 
   box.hidden = !show;
   this.requestRelayout_(100);
 };
 
+/**
+ * Detects what type of promo should be shown.
+ * @private
+ */
+FileListBannerController.prototype.checkPromoAvailable_ = function() {
+  var r = new XMLHttpRequest();
+  var self = this;

[Vladislav Kaznacheev, 2012/09/14 12:18:45]

Why not bind(this)? It would save you 1 line of the file length:)

[SeRya, 2012/09/14 14:36:23]

Done.

+  r.open('HEAD', GOOGLE_DRIVE_REDEEM, true);
+  r.onreadystatechange = function() {
+    if (r.readyState != 4)
+      return;
+    self.newWelcome_ = r.status == 404;

[Vladislav Kaznacheev, 2012/09/14 12:18:45]

It will show you the new welcome today, right?
I think it should be self.newWelcome_ = r.status == 200

[SeRya, 2012/09/14 14:36:23]

Done.

+    if (self.promoCallbacks_) {
+      for (var i = 0; i < self.promoCallbacks_.length; i++)
+        self.promoCallbacks_[i]();
+      self.promoCallbacks_ = undefined;
+    }
+  };
+  r.send();
+};
+
+/**
+ * @param {Function} completeCallback To be called (may be directly) when
+ *                                    this.newWelcome_ get ready.
+ * @private
+ */
+FileListBannerController.prototype.preparePromo_ = function(completeCallback) {
+  if (this.newWelcome_ !== undefined)
+    completeCallback();
+  else
+    (this.promoCallbacks_ = this.promoCallbacks_ || []).push(completeCallback);
+};
+