[gnome-shell/wip/fmuellner/notification-redux: 37/82] messageTray: Remove overlaid close button

[Florian Müllner <fmuellner src gnome org>]

commit 734534e3e2c4e9af40b6514a815937d554fbe077
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Feb 11 20:35:50 2015 +0100

    messageTray: Remove overlaid close button
    
    The notification now includes its own close button

 js/ui/messageTray.js |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index b33b161..e7bcdbf 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1183,11 +1183,6 @@ const MessageTray = new Lang.Class({
         this._notification = null;
         this._notificationClickedId = 0;
 
-        this._closeButton = Util.makeCloseButton();
-        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
-        this.actor.add_actor(this._closeButton);
-
         this._userActiveWhileNotificationShown = false;
 
         this.idleMonitor = Meta.IdleMonitor.get_core();
@@ -1214,7 +1209,6 @@ const MessageTray = new Lang.Class({
 
         Main.layoutManager.trayBox.add_actor(this.actor);
         Main.layoutManager.trackChrome(this.actor);
-        Main.layoutManager.trackChrome(this._closeButton);
 
         global.screen.connect('in-fullscreen-changed', Lang.bind(this, this._updateState));
 
@@ -1251,14 +1245,6 @@ const MessageTray = new Lang.Class({
         this._updateState();
     },
 
-    _closeNotification: function() {
-        if (this._notificationState == State.SHOWN) {
-            this._closeButton.hide();
-            this._notification.emit('done-displaying');
-            this._notification.destroy();
-        }
-    },
-
     contains: function(source) {
         return this._sources.has(source);
     },
@@ -1722,7 +1708,6 @@ const MessageTray = new Lang.Class({
         if (notification.isTransient)
             notification.destroy(NotificationDestroyedReason.EXPIRED);
 
-        this._closeButton.hide();
         this._pointerInNotification = false;
         this._notificationRemoved = false;
         this._notificationBin.child = null;
@@ -1751,7 +1736,6 @@ const MessageTray = new Lang.Class({
 
     _onNotificationExpanded: function() {
         let expandedY = - this.actor.height;
-        this._closeButton.show();
 
         // Don't animate the notification to its new position if it has shrunk:
         // there will be a very visible "gap" that breaks the illusion.