Remove chrome/ code to handle App Notifications

chrome/browser/resources/ntp4/apps_page.js

Index: chrome/browser/resources/ntp4/apps_page.js
diff --git a/chrome/browser/resources/ntp4/apps_page.js b/chrome/browser/resources/ntp4/apps_page.js
index 4fecaa6c564cf9787144431aef830264304491ec..c5b238569da7045a98f8b6bab5742a24d7d84fe5 100644
--- a/chrome/browser/resources/ntp4/apps_page.js
+++ b/chrome/browser/resources/ntp4/apps_page.js
@@ -65,15 +65,11 @@ cr.define('ntp', function() {
       menu.appendChild(this.launchTypeMenuSeparator_);
       this.options_ = this.appendMenuItem_('appoptions');
       this.details_ = this.appendMenuItem_('appdetails');
-      this.disableNotifications_ =
-          this.appendMenuItem_('appdisablenotifications');
       this.uninstall_ = this.appendMenuItem_('appuninstall');
       this.options_.addEventListener('activate',
                                      this.onShowOptions_.bind(this));
       this.details_.addEventListener('activate',
                                      this.onShowDetails_.bind(this));
-      this.disableNotifications_.addEventListener(
-          'activate', this.onDisableNotifications_.bind(this));
       this.uninstall_.addEventListener('activate',
                                        this.onUninstall_.bind(this));
 
@@ -144,12 +140,6 @@ cr.define('ntp', function() {
       this.details_.disabled = !app.appData.detailsUrl;
       this.uninstall_.disabled = !app.appData.mayDisable;
 
-      this.disableNotifications_.hidden = true;
-      var notificationsDisabled = app.appData.notifications_disabled;
-      if (typeof notificationsDisabled != 'undefined') {
-        this.disableNotifications_.hidden = false;
-        this.disableNotifications_.checked = notificationsDisabled;
-      }
       if (cr.isMac) {
         // On Windows and Linux, these should always be visible. On ChromeOS,
         // they are never created. On Mac, shortcuts can only be created for
@@ -187,14 +177,6 @@ cr.define('ntp', function() {
       url = appendParam(url, 'utm_source', 'chrome-ntp-launcher');
       window.location = url;
     },
-    onDisableNotifications_: function(e) {
-      var app = this.app_;
-      app.removeBubble();
-      // Toggle the current disable setting.
-      var newSetting = !this.disableNotifications_.checked;
-      app.appData.notifications_disabled = newSetting;
-      chrome.send('setNotificationsDisabled', [app.appData.id, newSetting]);
-    },
     onUninstall_: function(e) {
       chrome.send('uninstallApp', [this.app_.appData.id]);
     },
@@ -259,14 +241,6 @@ cr.define('ntp', function() {
       appSpan.textContent = appSpan.title = this.appData_.title;
       this.addLaunchClickTarget_(appSpan);
 
-      var notification = this.appData_.notification;
-      var hasNotification = typeof notification != 'undefined' &&
-                            typeof notification['title'] != 'undefined' &&
-                            typeof notification['body'] != 'undefined' &&
-                            !this.appData_.notifications_disabled;
-      if (hasNotification)
-        this.setupNotification_(notification);
-
       this.addEventListener('keydown', cr.ui.contextMenuHandler);
       this.addEventListener('keyup', cr.ui.contextMenuHandler);
 
@@ -335,77 +309,6 @@ cr.define('ntp', function() {
     },
 
     /**
-     * Creates a bubble node.
-     * @param {Object} notification The notification to show in the bubble.
-     * @param {boolean} full Whether we want the headline or just the content.
-     * @private
-     */
-    createBubbleNode_: function(notification, full) {
-      if (!full) {
-        var titleItem = this.ownerDocument.createElement('span');
-        titleItem.textContent = notification['title'];
-        return titleItem;
-      } else {
-        var container = this.ownerDocument.createElement('div');
-
-        var messageItem = this.ownerDocument.createElement('div');
-        messageItem.textContent = notification['body'];
-        container.appendChild(messageItem);
-
-        if (notification['linkUrl'] && notification['linkText']) {
-          var anchor = this.ownerDocument.createElement('a');
-          anchor.href = notification['linkUrl'];
-          anchor.textContent = notification['linkText'];
-          container.appendChild(anchor);
-        }
-
-        return container;
-      }
-    },
-
-    /**
-     * Sets up a notification for the app icon.
-     * @param {Object} notification The notification to show in the bubble.
-     * @private
-     */
-    setupNotification_: function(notification) {
-      if (notification) {
-        var infoBubble;
-        if (!this.currentBubbleShowing_) {
-          // Create a new bubble.
-          infoBubble = new cr.ui.ExpandableBubble;
-          infoBubble.anchorNode = this;
-          infoBubble.appId = this.appData_.id;
-          infoBubble.handleCloseEvent = function() {
-            chrome.send('closeNotification', [this.appId]);
-            infoBubble.hide();
-          };
-        } else {
-          // Reuse the old bubble instead of popping up a new bubble over
-          // the old one.
-          infoBubble = this.currentBubbleShowing_;
-          infoBubble.collapseBubble_();
-        }
-        infoBubble.contentTitle = this.createBubbleNode_(notification, false);
-        infoBubble.content = this.createBubbleNode_(notification, true);
-        infoBubble.show();
-        infoBubble.resizeAndReposition();
-
-        this.currentBubbleShowing_ = infoBubble;
-      }
-    },
-
-    /**
-     *  Removes the info bubble if there is one.
-     */
-    removeBubble: function() {
-      if (this.currentBubbleShowing_) {
-        this.currentBubbleShowing_.hide();
-        this.currentBubbleShowing_ = null;
-      }
-    },
-
-    /**
      * Set the size and position of the app tile.
      * @param {number} size The total size of |this|.
      * @param {number} x The x-position.
@@ -433,9 +336,6 @@ cr.define('ntp', function() {
       this.style.left = toCssPx(x);
       this.style.right = toCssPx(x);
       this.style.top = toCssPx(y);
-
-      if (this.currentBubbleShowing_)
-        this.currentBubbleShowing_.resizeAndReposition();
     },
 
     /**
@@ -514,9 +414,9 @@ cr.define('ntp', function() {
 
     /**
      * Handler for mousedown on the App. Adds a class that allows us to
-     * not display as :active for right clicks and clicks on app notifications
-     * (specifically, don't pulse on these occasions). Also, we don't pulse
-     * for clicks that aren't within the clickable regions.
+     * not display as :active for right clicks (specifically, don't pulse on
+     * these occasions). Also, we don't pulse for clicks that aren't within the
+     * clickable regions.
      * @param {Event} e The mousedown event.
      */
     onMousedown_: function(e) {
@@ -589,8 +489,6 @@ cr.define('ntp', function() {
     removeFromChrome: function() {
       chrome.send('uninstallApp', [this.appData_.id, true]);
       this.tile.tilePage.removeTile(this.tile, true);
-      if (this.currentBubbleShowing_)
-        currentBubbleShowing_.hide();
     },
 
     /**
@@ -644,12 +542,6 @@ cr.define('ntp', function() {
       this.classList.add('apps-page');
 
       this.addEventListener('cardselected', this.onCardSelected_);
-      // Add event listeners for two events, so we can temporarily suppress
-      // the app notification bubbles when the app card slides in and out of
-      // view.
-      this.addEventListener('carddeselected', this.onCardDeselected_);
-      this.addEventListener('cardSlider:card_change_ended',
-                            this.onCardChangeEnded_);
 
       this.addEventListener('tilePage:tile_added', this.onTileAdded_);
 
@@ -694,8 +586,6 @@ cr.define('ntp', function() {
       var apps = this.querySelectorAll('.app.icon-loading');
       for (var i = 0; i < apps.length; i++) {
         apps[i].loadIcon();
-        if (apps[i].currentBubbleShowing_)
-          apps[i].currentBubbleShowing_.suppressed = false;
       }
     },
 
@@ -711,36 +601,6 @@ cr.define('ntp', function() {
     },
 
     /**
-     * Handler for the when this.cardSlider ends change its card. If animated,
-     * this happens when the -webkit-transition is done, otherwise happens
-     * immediately (but after cardSlider:card_changed).
-     * @private
-     */
-    onCardChangeEnded_: function(e) {
-      for (var i = 0; i < this.tileElements_.length; i++) {
-        var app = this.tileElements_[i].firstChild;
-        assert(app instanceof App);
-        if (app.currentBubbleShowing_)
-          app.currentBubbleShowing_.suppressed = false;
-      }
-    },
-
-    /**
-     * Handler for the 'carddeselected' event, fired when the user switches
-     * to another 'card' than the App 'card' on the NTP (|this| gets
-     * deselected).
-     * @private
-     */
-    onCardDeselected_: function(e) {
-      for (var i = 0; i < this.tileElements_.length; i++) {
-        var app = this.tileElements_[i].firstChild;
-        assert(app instanceof App);
-        if (app.currentBubbleShowing_)
-          app.currentBubbleShowing_.suppressed = true;
-      }
-    },
-
-    /**
      * A handler for when the apps page is scrolled (then we need to reposition
      * the bubbles.
      * @private
@@ -751,9 +611,7 @@ cr.define('ntp', function() {
       for (var i = 0; i < this.tileElements_.length; i++) {
         var app = this.tileElements_[i].firstChild;
         assert(app instanceof App);
-        if (app.currentBubbleShowing_)
-          app.currentBubbleShowing_.resizeAndReposition();
-        }
+      }
     },
 
     /** @override */
@@ -892,16 +750,8 @@ cr.define('ntp', function() {
     chrome.send('launchApp', [appId, APP_LAUNCH.NTP_APP_RE_ENABLE]);
   }
 
-  function appNotificationChanged(id, notification) {
-    var app = $(id);
-    // The app might have been uninstalled, or notifications might be disabled.
-    if (app && !app.appData.notifications_disabled)
-      app.setupNotification_(notification);
-  }
-
   return {
     APP_LAUNCH: APP_LAUNCH,
-    appNotificationChanged: appNotificationChanged,
     AppsPage: AppsPage,
     launchAppAfterEnable: launchAppAfterEnable,
   };