Add desktop notifications, overridable in the same way as other components (although it's not a react component). Also extend the flux dispatcher a little to be less dumb about dispatching while something else is already dispatching.

skins/base/views/molecules/MatrixToolbar.js

@@ -21,6 +21,7 @@ var React = require('react');
 var ComponentBroker = require('../../../../src/ComponentBroker');
 
 var LogoutButton = ComponentBroker.get("atoms/LogoutButton");
+var EnableNotificationsButton = ComponentBroker.get("atoms/EnableNotificationsButton");
 
 var MatrixToolbarController = require("../../../../src/controllers/molecules/MatrixToolbar");
 
@@ -32,6 +33,7 @@ module.exports = React.createClass({
         return (
             <div className="mx_MatrixToolbar">
                 <LogoutButton />
+                <EnableNotificationsButton />
             </div>
         );
     }