Remove chrome/ code to handle App Notifications

chrome/browser/resources/ntp4/apps_page.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.
 
 cr.define('ntp', function() {
   'use strict';
 
   var APP_LAUNCH = {
     // The histogram buckets (keep in sync with extension_constants.h).
     NTP_APPS_MAXIMIZED: 0,
@@ skipping 47 matching lines @@
       var self = this;
       this.forAllLaunchTypes_(function(launchTypeButton, id) {
         launchTypeButton.addEventListener('activate',
             self.onLaunchTypeChanged_.bind(self));
       });
 
       this.launchTypeMenuSeparator_ = cr.ui.MenuItem.createSeparator();
       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));
 
       if (!cr.isChromeOS) {
         this.createShortcutSeparator_ =
             menu.appendChild(cr.ui.MenuItem.createSeparator());
         this.createShortcut_ = this.appendMenuItem_('appcreateshortcut');
         this.createShortcut_.addEventListener(
             'activate', this.onCreateShortcut_.bind(this));
       }
@@ skipping 50 matching lines @@
         launchTypeButton.checked = app.appData.launch_type == id;
         launchTypeButton.hidden = app.appData.packagedApp;
       });
 
       this.launchTypeMenuSeparator_.hidden = app.appData.packagedApp;
 
       this.options_.disabled = !app.appData.optionsUrl || !app.appData.enabled;
       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
         // new-style packaged apps, so hide the menu item.
         this.createShortcutSeparator_.hidden = this.createShortcut_.hidden =
             !app.appData.packagedApp;
       }
     },
 
     /**
@@ skipping 17 matching lines @@
       });
     },
     onShowOptions_: function(e) {
       window.location = this.app_.appData.optionsUrl;
     },
     onShowDetails_: function(e) {
       var url = this.app_.appData.detailsUrl;
       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]);
     },
     onCreateShortcut_: function(e) {
       chrome.send('createAppShortcut', [this.app_.appData.id]);
     },
   };
 
   /**
    * Creates a new App object.
@@ skipping 44 matching lines @@
         chrome.send('getAppIconDominantColor', [this.id]);
       } else {
         this.addLaunchClickTarget_(this.appImgContainer_);
         this.appImgContainer_.title = this.appData_.title;
       }
 
       var appSpan = this.appContents_.querySelector('.title');
       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);
 
       // This hack is here so that appContents.contextMenu will be the same as
       // this.contextMenu.
       var self = this;
       this.appContents_.__defineGetter__('contextMenu', function() {
         return self.contextMenu;
       });
       this.appContents_.addEventListener('contextmenu',
@@ skipping 48 matching lines @@
       if (this.appImgSrc_) {
         this.appImg_.src = this.appImgSrc_;
         this.appImg_.classList.remove('invisible');
         this.appImgSrc_ = null;
       }
 
       this.classList.remove('icon-loading');
     },
 
     /**
-     * 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.
      * @param {number} y The y-position.
      *     animate.
      */
     setBounds: function(size, x, y) {
       var imgSize = size * APP_IMG_SIZE_FRACTION;
       this.appImgContainer_.style.width = this.appImgContainer_.style.height =
           toCssPx(this.useSmallIcon_ ? 16 : imgSize);
       if (this.useSmallIcon_) {
         // 3/4 is the ratio of 96px to 128px (the used height and full height
         // of icons in apps).
         var iconSize = imgSize * 3 / 4;
         // The -2 is for the div border to improve the visual alignment for the
         // icon div.
         this.imgDiv_.style.width = this.imgDiv_.style.height =
             toCssPx(iconSize - 2);
         // Margins set to get the icon placement right and the text to line up.
         this.imgDiv_.style.marginTop = this.imgDiv_.style.marginBottom =
             toCssPx((imgSize - iconSize) / 2);
       }
 
       this.style.width = this.style.height = toCssPx(size);
       this.style.left = toCssPx(x);
       this.style.right = toCssPx(x);
       this.style.top = toCssPx(y);
-
-      if (this.currentBubbleShowing_)
-        this.currentBubbleShowing_.resizeAndReposition();
     },
 
     /**
      * Invoked when an app is clicked.
      * @param {Event} e The click event.
      * @private
      */
     onClick_: function(e) {
       var url = !this.appData_.is_webstore ? '' :
           appendParam(this.appData_.url,
@@ skipping 58 matching lines @@
      * will cause the app icon to look active).
      * @param {HTMLElement} node The node that should be clickable.
      */
     addLaunchClickTarget_: function(node) {
       node.classList.add('launch-click-target');
       node.addEventListener('click', this.onClick_.bind(this));
     },
 
     /**
      * 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) {
       // If the current platform uses middle click to autoscroll and this
       // mousedown isn't handled, onClick_() will never fire. crbug.com/142939
       if (e.button == 1)
         e.preventDefault();
 
       if (e.button == 2 ||
           !findAncestorByClass(e.target, 'launch-click-target')) {
@@ skipping 52 matching lines @@
     canBeRemoved: function() {
       return this.appData_.mayDisable;
     },
 
     /**
      * Uninstalls the app after it's been dropped on the trash.
      */
     removeFromChrome: function() {
       chrome.send('uninstallApp', [this.appData_.id, true]);
       this.tile.tilePage.removeTile(this.tile, true);
-      if (this.currentBubbleShowing_)
-        currentBubbleShowing_.hide();
     },
 
     /**
      * Called when a drag is starting on the tile. Updates dataTransfer with
      * data for this tile.
      */
     setDragData: function(dataTransfer) {
       dataTransfer.setData('Text', this.appData_.title);
       dataTransfer.setData('URL', this.appData_.url);
     },
@@ skipping 33 matching lines @@
     return el;
   }
 
   AppsPage.prototype = {
     __proto__: TilePage.prototype,
 
     initialize: 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_);
 
       this.content_.addEventListener('scroll', this.onScroll_.bind(this));
     },
 
     /**
      * Highlight a newly installed app as it's added to the NTP.
      * @param {Object} appData The data object that describes the app.
      */
@@ skipping 24 matching lines @@
 
     /**
      * Handler for 'cardselected' event, fired when |this| is selected. The
      * first time this is called, we load all the app icons.
      * @private
      */
     onCardSelected_: function(e) {
       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;
       }
     },
 
     /**
      * Handler for tile additions to this page.
      * @param {Event} e The tilePage:tile_added event.
      */
     onTileAdded_: function(e) {
       assert(e.currentTarget == this);
       assert(e.addedTile.firstChild instanceof App);
       if (this.classList.contains('selected-card'))
         e.addedTile.firstChild.loadIcon();
     },
 
     /**
-     * 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
      */
     onScroll_: function(e) {
       if (!this.selected)
         return;
       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 */
     doDragOver: function(e) {
       // Only animatedly re-arrange if the user is currently dragging an app.
       var tile = ntp.getCurrentlyDraggingTile();
       if (tile && tile.querySelector('.app')) {
         TilePage.prototype.doDragOver.call(this, e);
       } else {
         e.preventDefault();
@@ skipping 118 matching lines @@
 
   /**
    * Launches the specified app using the APP_LAUNCH_NTP_APP_RE_ENABLE
    * histogram. This should only be invoked from the AppLauncherHandler.
    * @param {string} appID The ID of the app.
    */
   function launchAppAfterEnable(appId) {
     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,
   };
 });