 
 _ = require 'underscore-plus'
 {deprecate, includeDeprecations} = require 'grim'
-{Emitter} = require 'event-kit'
+{CompositeDisposable, Emitter} = require 'event-kit'
 {Model} = require 'theorist'
 fs = require 'fs-plus'
 {convertStackTrace, convertLine} = require 'coffeestack'

      @emit 'uncaught-error', arguments...
      @emitter.emit 'did-throw-error', {message, url, line, column, originalError}

    @unsubscribe()
    @setBodyPlatformClass()

    @loadTime = null

    @requireUserInitScript() unless safeMode

    @menu.update()
    @disposables.add @config.onDidChange 'core.autoHideMenuBar', ({newValue}) =>
      @setAutoHideMenuBar(newValue)
    @setAutoHideMenuBar(true) if @config.get('core.autoHideMenuBar')

