Bug 1211166 - Use AppConstants in SessionRecorder.jsm r=ted
authorPhilip Chee <philip.chee@gmail.com>
Fri, 17 Apr 2015 13:08:39 +0800
changeset 278157 00590dc73f7e57c3d0803310a4ba9122f5adcb72
parent 278156 17576c804d39415c937c6cbeb2136f05d8299963
child 278158 740e4ce7bb1623505a8555c9a2be80f8700e32fe
push id69700
push userphilip.chee@gmail.com
push dateFri, 01 Jan 2016 16:28:03 +0000
treeherdermozilla-inbound@00590dc73f7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1211166
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1211166 - Use AppConstants in SessionRecorder.jsm r=ted
toolkit/modules/SessionRecorder.jsm
toolkit/modules/moz.build
--- a/toolkit/modules/SessionRecorder.jsm
+++ b/toolkit/modules/SessionRecorder.jsm
@@ -1,24 +1,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef MERGED_COMPARTMENT
-
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "SessionRecorder",
 ];
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
-#endif
-
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://services-common/utils.js");
 
 
 // We automatically prune sessions older than this.
 const MAX_SESSION_AGE_MS = 7 * 24 * 60 * 60 * 1000; // 7 days.
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -60,16 +60,17 @@ EXTRA_JS_MODULES += [
     'RemoteWebNavigation.jsm',
     'RemoteWebProgress.jsm',
     'ResetProfile.jsm',
     'secondscreen/RokuApp.jsm',
     'secondscreen/SimpleServiceDiscovery.jsm',
     'SelectContentHelper.jsm',
     'SelectParentHelper.jsm',
     'Services.jsm',
+    'SessionRecorder.jsm',
     'sessionstore/FormData.jsm',
     'sessionstore/ScrollPosition.jsm',
     'sessionstore/XPathGenerator.jsm',
     'ShortcutUtils.jsm',
     'Sntp.jsm',
     'SpatialNavigation.jsm',
     'Sqlite.jsm',
     'Task.jsm',
@@ -78,17 +79,16 @@ EXTRA_JS_MODULES += [
     'UpdateUtils.jsm',
     'WebChannel.jsm',
     'WindowDraggingUtils.jsm',
     'ZipUtils.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'AppConstants.jsm',
-    'SessionRecorder.jsm',
 ]
 
 if 'Android' != CONFIG['OS_TARGET']:
     EXTRA_JS_MODULES += [
         'LightweightThemeConsumer.jsm',
     ]
 else:
     DEFINES['ANDROID'] = True