Add menu option for disabling app notifications

chrome/browser/resources/ntp4/apps_page.js

 // Copyright (c) 2011 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('ntp4', function() {
   'use strict';
 
   var localStrings = new LocalStrings;
 
   var APP_LAUNCH = {
@@ skipping 45 matching lines @@
       this.launchFullscreen_ = this.appendMenuItem_('applaunchtypefullscreen');
 
       var self = this;
       this.forAllLaunchTypes_(function(launchTypeButton, id) {
         launchTypeButton.addEventListener('activate',
             self.onLaunchTypeChanged_.bind(self));
       });
 
       menu.appendChild(cr.ui.MenuItem.createSeparator());
       this.options_ = this.appendMenuItem_('appoptions');
+      this.disableNotifications_ =
+          this.appendMenuItem_('appdisablenotifications');
       this.uninstall_ = this.appendMenuItem_('appuninstall');
       this.options_.addEventListener('activate',
                                      this.onShowOptions_.bind(this));
+      this.disableNotifications_.addEventListener(
+          'activate', this.onDisableNotifications_.bind(this));
       this.uninstall_.addEventListener('activate',
                                        this.onUninstall_.bind(this));
 
       if (!cr.isMac && !cr.isChromeOS) {
         menu.appendChild(cr.ui.MenuItem.createSeparator());
         this.createShortcut_ = this.appendMenuItem_('appcreateshortcut');
         this.createShortcut_.addEventListener(
             'activate', this.onCreateShortcut_.bind(this));
       }
 
@@ skipping 29 matching lines @@
 
       for (var i = 0; i < launchTypes.length; ++i) {
         if (!launchTypes[i])
           continue;
 
         f(launchTypes[i], i);
       }
     },
 
     /**
-     * Does all the necessary setup to show the menu for the give app.
+     * Does all the necessary setup to show the menu for the given app.
      * @param {App} app The App object that will be showing a context menu.
      */
     setupForApp: function(app) {
       this.app_ = app;
 
       this.launch_.textContent = app.appData.title;
 
       this.forAllLaunchTypes_(function(launchTypeButton, id) {
         launchTypeButton.disabled = false;
         launchTypeButton.checked = app.appData.launch_type == id;
       });
 
       this.options_.disabled = !app.appData.options_url || !app.appData.enabled;
       this.uninstall_.disabled = !app.appData.can_uninstall;
+
+      this.disableNotifications_.hidden = true;
+      var notificationsDisabled = app.appData.notifications_disabled;
+      if (typeof notificationsDisabled != 'undefined') {
+        this.disableNotifications_.hidden = false;
+        this.disableNotifications_.checked = notificationsDisabled;
+      }
     },
 
     /**
      * Handlers for menu item activation.
      * @param {Event} e The activation event.
      * @private
      */
     onLaunch_: function(e) {
       chrome.send('launchApp', [this.app_.appId, APP_LAUNCH.NTP_APPS_MENU]);
     },
     onLaunchTypeChanged_: function(e) {
       var pressed = e.currentTarget;
       var app = this.app_;
       this.forAllLaunchTypes_(function(launchTypeButton, id) {
         if (launchTypeButton == pressed) {
           chrome.send('setLaunchType', [app.appId, id]);
           // Manually update the launch type. We will only get
           // appsPrefChangeCallback calls after changes to other NTP instances.
           app.appData.launch_type = id;
         }
       });
     },
     onShowOptions_: function(e) {
       window.location = this.app_.appData.options_url;
     },
+    onDisableNotifications_: function(e) {
+      var app = this.app_;
+      var disabled = this.disableNotifications_.checked;
+      app.removeBubble();
+      app.appData.notifications_disabled = !disabled;

[Evan Stade, 2011/12/05 23:19:32]

as it stands, isn't this backwards

[asargent_no_longer_on_chrome, 2011/12/06 00:14:55]

Nope, this event handler toggles the sense of the "disabled" flag, so it's
supposed to change from true to false. 

I did a slight refactor of these lines of code to try to make this more clear.

[Evan Stade, 2011/12/06 01:27:08]

ah, I think the confusion is about whether checked refers to before or after the
click.

+      chrome.send('setNotificationsDisabled',
+                  [app.appData.id, app.appData.notifications_disabled]);

[Evan Stade, 2011/12/05 23:19:32]

nit: s/app.appData.notifications_disabled/disabled/

[asargent_no_longer_on_chrome, 2011/12/06 00:14:55]

fixed by refactor

+    },
     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 47 matching lines @@
         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';
+                            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() {
@@ skipping 113 matching lines @@
         }
         infoBubble.contentTitle = this.createBubbleNode_(notification, false);
         infoBubble.content = this.createBubbleNode_(notification, true);
         infoBubble.show();
 
         this.currentBubbleShowing_ = infoBubble;
       }
     },
 
     /**
+     *  Removes the info bubble if there is one.
+     */
+    removeBubble: function() {
+      if (this.currentBubbleShowing_) {
+        this.currentBubbleShowing_.hide();
+        this.currentBubbleShowing_ = null;
+      }
+    },
+
+    /**
      * Creates the apps-promo section of the app (should only be called for the
      * webstore app).
      * @private
      */
     createAppsPromoExtras_: function() {
       this.classList.add('webstore');
 
       this.appsPromoExtras_ = $('apps-promo-extras-template').cloneNode(true);
       this.appsPromoExtras_.id = '';
       this.appsPromoHeading_ =
@@ skipping 415 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);
-    if (app)  // The app might have been uninstalled.
+    // 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,
   };
 });
 
 // TODO(estade): update the content handlers to use ntp namespace instead of
 // making these global.
 var appNotificationChanged = ntp4.appNotificationChanged;
 var launchAppAfterEnable = ntp4.launchAppAfterEnable;