Merge 192009 "Files.app: refinement of the condition of authenti..."

> Files.app: refinement of the condition of authentication error.
> 
> This patch limits the condition to show the authentication error banner. With this patch, the banner shoes only when authentication fails.
> 
> BUG=180308, 180316
> TEST=manual
> 
> Review URL: https://chromiumcodereview.appspot.com/13144010

TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/13856002

git-svn-id: svn://svn.chromium.org/chrome/branches/1453/src@192956 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/chrome/browser/resources/file_manager/js/drive_banners.js b/chrome/browser/resources/file_manager/js/drive_banners.js
index 2dcef13..322a51a 100644
--- a/chrome/browser/resources/file_manager/js/drive_banners.js
+++ b/chrome/browser/resources/file_manager/js/drive_banners.js
@@ -644,8 +644,13 @@ FileListBannerController.prototype.updateDriveUnmountedPanel_ = function() {
  */
 FileListBannerController.prototype.maybeShowAuthFailBanner_ = function() {
   var connection = this.volumeManager_.getDriveConnectionState();
+  var reasons = connection.reasons;
   var showDriveNotReachedMessage =
+      this.isOnDrive() &&
       connection.type == VolumeManager.DriveConnectionType.OFFLINE &&
-      connection.reasons.indexOf('not_ready') !== -1;
+      // Show the banner only when authentication fails. Don't show it when the
+      // drive service is disabled.
+      reasons.indexOf(VolumeManager.DriveConnectionReason.NOT_READY) != -1 &&
+      reasons.indexOf(VolumeManager.DriveConnectionReason.NO_SERVICE) == -1;
   this.authFailedBanner_.hidden = !showDriveNotReachedMessage;
 };